summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-02-24 16:17:51 -0500
committerandroid-merger <android-build@android.com>2011-02-24 18:45:01 -0800
commit9fb971fa97f29dd7ae8f1032033d07511d2365a1 (patch)
treecbd40c42f7c524c3238c7e773a9b4ca792ca51a6 /WebCore/platform
parent74279f07b8e8909c798d5715c68b9454a52e7902 (diff)
downloadexternal_webkit-9fb971fa97f29dd7ae8f1032033d07511d2365a1.zip
external_webkit-9fb971fa97f29dd7ae8f1032033d07511d2365a1.tar.gz
external_webkit-9fb971fa97f29dd7ae8f1032033d07511d2365a1.tar.bz2
Do not merge: cherry-pick incorect clip CL from master
Fix problem where plugins were not drawn due to an incorrect clip. bug: 3451982 Change-Id: I9eaaa218afa1a386dcb89d1d7845f80b0b180959
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/graphics/android/MediaLayer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp
index d8bbefc..9bc2a3e 100644
--- a/WebCore/platform/graphics/android/MediaLayer.cpp
+++ b/WebCore/platform/graphics/android/MediaLayer.cpp
@@ -73,6 +73,8 @@ MediaLayer::~MediaLayer()
bool MediaLayer::drawGL(SkMatrix& matrix)
{
+ TilesManager::instance()->shader()->clip(drawClip());
+
// check to see if we need to create a video texture
m_videoTexture->initNativeWindowIfNeeded();
// draw any video content if present