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

Unified Diff: Source/WebCore/rendering/RenderLayer.cpp

Issue 8399041: Merge 98060 - Hidden composited iframes cause infinite loop (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
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/ChangeLog ('k') | Source/WebCore/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderLayer.cpp
===================================================================
--- Source/WebCore/rendering/RenderLayer.cpp (revision 98584)
+++ Source/WebCore/rendering/RenderLayer.cpp (working copy)
@@ -3788,13 +3788,17 @@
#if USE(ACCELERATED_COMPOSITING)
RenderLayerBacking* RenderLayer::ensureBacking()
{
- if (!m_backing)
+ if (!m_backing) {
m_backing = adoptPtr(new RenderLayerBacking(this));
+ compositor()->layerBecameComposited(this);
+ }
return m_backing.get();
}
void RenderLayer::clearBacking()
{
+ if (m_backing && !renderer()->documentBeingDestroyed())
+ compositor()->layerBecameNonComposited(this);
m_backing.clear();
}
« no previous file with comments | « Source/WebCore/ChangeLog ('k') | Source/WebCore/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698