diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-05-09 15:07:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 15:54:03 +0200 |
| commit | 626e0c352765ecbe4211861b00d6ed56d974204e (patch) | |
| tree | 7eb6a08b04dc6aa2742bc8feda8bf5a23c865e24 | |
| parent | 11ab493ffbb20c6632e04ad2cf20b5a17ed3f010 (diff) | |
| download | qtwebkit-626e0c352765ecbe4211861b00d6ed56d974204e.tar.gz | |
Stop the clearContentsTimer when removing an image backing.
It creates a race condition that can lead to crashes when the WebView's
visible property is set to false and the image backing is removed
shortly after.
Task-number: QTBUG-38841
Change-Id: I0775ba33fda9cee5f86ef50a4fbe048602564296
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp index 5ca430b47..744a6a027 100644 --- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp +++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp @@ -92,8 +92,10 @@ void CoordinatedImageBacking::removeHost(Host* host) ASSERT(position != notFound); m_hosts.remove(position); - if (m_hosts.isEmpty()) + if (m_hosts.isEmpty()) { m_client->removeImageBacking(id()); + m_clearContentsTimer.stop(); + } } void CoordinatedImageBacking::markDirty() |