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

Unified Diff: Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

Issue 7982004: Merge 95506 - [chromium] ContentLayer's texture updater deleted during paint when compositing tur... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (revision 95551)
+++ Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (working copy)
@@ -428,6 +428,11 @@
if (dirtyLayerRect.isEmpty())
return;
+ // Calling prepareToUpdate() calls into WebKit to paint, which may have the side
+ // effect of disabling compositing, which causes our reference to the texture updater to be deleted.
+ // However, we can't free the memory backing the GraphicsContext until the paint finishes,
+ // so we grab a local reference here to hold the updater alive until the paint completes.
+ RefPtr<LayerTextureUpdater> protector(textureUpdater());
textureUpdater()->prepareToUpdate(m_paintRect, m_tiler->tileSize(), m_tiler->hasBorderTexels());
}
« no previous file with comments | « Source/WebCore/platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698