| 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)
|
|
|