Merge 98060 - Hidden composited iframes cause infinite loop

Source/WebCore/rendering/RenderLayerCompositor.h

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;