summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/MediaLayer.cpp
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2011-03-02 10:45:24 -0500
committerPatrick Scott <phanna@android.com>2011-03-07 09:11:25 -0500
commit9e143ba2bd15b3dd507999ba142269ab17df938a (patch)
treee1661ae18b008491e59c1597069e1b81e0ef8294 /WebCore/platform/graphics/android/MediaLayer.cpp
parent4ffd02f8c673bc6ce1a6b96f9fd3b21e8337ec7c (diff)
downloadexternal_webkit-9e143ba2bd15b3dd507999ba142269ab17df938a.zip
external_webkit-9e143ba2bd15b3dd507999ba142269ab17df938a.tar.gz
external_webkit-9e143ba2bd15b3dd507999ba142269ab17df938a.tar.bz2
Do not merge.
Remove the notion of root layers. We were computing the root layer status incorrectly for some child layers. If an iframe has a layer but it hasn't been attached, we might assume it is the root layer of the tree and not produce a recording content. Bug: 3492471 Change-Id: Ib81fb26d76742d74ebe244c34c1fab353fb9b78d
Diffstat (limited to 'WebCore/platform/graphics/android/MediaLayer.cpp')
-rw-r--r--WebCore/platform/graphics/android/MediaLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp
index 2443a5e..6c34585 100644
--- a/WebCore/platform/graphics/android/MediaLayer.cpp
+++ b/WebCore/platform/graphics/android/MediaLayer.cpp
@@ -40,7 +40,7 @@
namespace WebCore {
-MediaLayer::MediaLayer(jobject weakWebViewRef) : LayerAndroid(false)
+MediaLayer::MediaLayer(jobject weakWebViewRef) : LayerAndroid((RenderLayer*) NULL)
{
m_bufferedTexture = new MediaTexture(EGL_NO_CONTEXT);
m_bufferedTexture->incStrong(this);