diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/rendering/RenderLayerCompositor.h | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/rendering/RenderLayerCompositor.h')
-rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h index 24e182c..1cf9ea9 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.h +++ b/Source/WebCore/rendering/RenderLayerCompositor.h @@ -88,6 +88,11 @@ public: // at specific times. void scheduleLayerFlush(); void flushPendingLayerChanges(); + bool isFlushingLayers() const { return m_flushingLayers; } + + // flushPendingLayerChanges() flushes the entire GraphicsLayer tree, which can cross frame boundaries. + // This call returns the rootmost compositor that is being flushed (including self). + RenderLayerCompositor* enclosingCompositorFlushingLayers() const; // Rebuild the tree of compositing layers void updateCompositingLayers(CompositingUpdateType = CompositingUpdateAfterLayoutOrStyleChange, RenderLayer* updateRoot = 0); @@ -271,6 +276,7 @@ private: bool m_compositing; bool m_compositingLayersNeedRebuild; + bool m_flushingLayers; RootLayerAttachment m_rootLayerAttachment; |