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

Unified Diff: Source/core/html/HTMLMediaElement.cpp

Issue 696103003: Avoid trigger compositing update on media player finalization. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 3ffd916606a5ea6f02b9c26b6234b3f2abb35e44..7e37c49b948678a82aae9cfb722e751b8f3106b8 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -3947,15 +3947,18 @@ void HTMLMediaElement::mediaPlayerSetWebLayer(blink::WebLayer* webLayer)
return;
// If either of the layers is null we need to enable or disable compositing. This is done by triggering a style recalc.
- if (!m_webLayer || !webLayer)
+ if ((!m_webLayer || !webLayer)
+#if ENABLE(OILPAN)
+ && !isFinalizing()
+#endif
+ )
setNeedsCompositingUpdate();
if (m_webLayer)
GraphicsLayer::unregisterContentsLayer(m_webLayer);
m_webLayer = webLayer;
- if (m_webLayer) {
+ if (m_webLayer)
GraphicsLayer::registerContentsLayer(m_webLayer);
- }
}
void HTMLMediaElement::mediaPlayerMediaSourceOpened(blink::WebMediaSource* webMediaSource)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698