diff options
| author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
| commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
| tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebCore/platform/graphics/qt/GraphicsLayerQt.cpp | |
| parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
| download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 | |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebCore/platform/graphics/qt/GraphicsLayerQt.cpp')
| -rw-r--r-- | WebCore/platform/graphics/qt/GraphicsLayerQt.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp index e0941f5..aa7ed2f 100644 --- a/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp +++ b/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp @@ -200,6 +200,7 @@ public: TransformationMatrix m_transformRelativeToRootLayer; bool m_transformAnimationRunning; bool m_opacityAnimationRunning; + bool m_blockNotifySyncRequired; #ifndef QT_NO_GRAPHICSEFFECT QWeakPointer<MaskEffectQt> m_maskEffect; #endif @@ -300,6 +301,7 @@ GraphicsLayerQtImpl::GraphicsLayerQtImpl(GraphicsLayerQt* newLayer) , m_layer(newLayer) , m_transformAnimationRunning(false) , m_opacityAnimationRunning(false) + , m_blockNotifySyncRequired(false) , m_changeMask(NoChanges) #if ENABLE(3D_CANVAS) , m_gc3D(0) @@ -593,6 +595,8 @@ void GraphicsLayerQtImpl::paint(QPainter* painter, const QStyleOptionGraphicsIte void GraphicsLayerQtImpl::notifySyncRequired() { + m_blockNotifySyncRequired = false; + if (m_layer->client()) m_layer->client()->notifySyncRequired(m_layer); } @@ -600,8 +604,14 @@ void GraphicsLayerQtImpl::notifySyncRequired() void GraphicsLayerQtImpl::notifyChange(ChangeMask changeMask) { m_changeMask |= changeMask; + + if (m_blockNotifySyncRequired) + return; + static QMetaMethod syncMethod = staticMetaObject.method(staticMetaObject.indexOfMethod("notifySyncRequired()")); syncMethod.invoke(this, Qt::QueuedConnection); + + m_blockNotifySyncRequired = true; } void GraphicsLayerQtImpl::flushChanges(bool recursive, bool forceUpdateTransform) |