From 9fb971fa97f29dd7ae8f1032033d07511d2365a1 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 24 Feb 2011 16:17:51 -0500 Subject: [PATCH] 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 --- WebCore/platform/graphics/android/MediaLayer.cpp | 2 ++ WebKit/android/plugins/ANPOpenGLInterface.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp index d8bbefce0..9bc2a3edd 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 diff --git a/WebKit/android/plugins/ANPOpenGLInterface.cpp b/WebKit/android/plugins/ANPOpenGLInterface.cpp index 015a04cc2..839ec174e 100644 --- a/WebKit/android/plugins/ANPOpenGLInterface.cpp +++ b/WebKit/android/plugins/ANPOpenGLInterface.cpp @@ -67,8 +67,8 @@ static ANPTextureInfo anp_lockTexture(NPP instance) { ANPTextureInfo anpInfo; anpInfo.textureId = info->m_textureId; - anpInfo.width = info->m_width; - anpInfo.height = info->m_height; + anpInfo.width = (int32_t) info->m_width; + anpInfo.height = (int32_t) info->m_height; anpInfo.internalFormat = info->m_internalFormat; return anpInfo; } -- 2.11.0