Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Unified Diff: Source/WebCore/rendering/RenderLayerCompositor.h

Issue 8403008: Merge 98060 - Hidden composited iframes cause infinite loop (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/rendering/RenderLayer.cpp ('k') | Source/WebCore/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayerCompositor.h
===================================================================
--- Source/WebCore/rendering/RenderLayerCompositor.h (revision 98520)
+++ Source/WebCore/rendering/RenderLayerCompositor.h (working copy)
@@ -151,6 +151,13 @@
void clearBackingForAllLayers();
+ void layerBecameComposited(const RenderLayer*) { ++m_compositedLayerCount; }
+ void layerBecameNonComposited(const RenderLayer*)
+ {
+ ASSERT(m_compositedLayerCount > 0);
+ --m_compositedLayerCount;
+ }
+
void didStartAcceleratedAnimation(CSSPropertyID);
#if ENABLE(VIDEO)
@@ -245,6 +252,8 @@
bool layerHas3DContent(const RenderLayer*) const;
bool hasNonIdentity3DTransform(RenderObject*) const;
+
+ bool hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const;
void ensureRootLayer();
void destroyRootLayer();
@@ -284,6 +293,7 @@
bool m_hasAcceleratedCompositing;
ChromeClient::CompositingTriggerFlags m_compositingTriggers;
+ int m_compositedLayerCount;
bool m_showDebugBorders;
bool m_showRepaintCounter;
bool m_compositingConsultsOverlap;
« no previous file with comments | « Source/WebCore/rendering/RenderLayer.cpp ('k') | Source/WebCore/rendering/RenderLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698