diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-02-24 16:17:51 -0500 |
|---|---|---|
| committer | android-merger <android-build@android.com> | 2011-02-24 18:45:01 -0800 |
| commit | 9fb971fa97f29dd7ae8f1032033d07511d2365a1 (patch) | |
| tree | cbd40c42f7c524c3238c7e773a9b4ca792ca51a6 | |
| parent | 74279f07b8e8909c798d5715c68b9454a52e7902 (diff) | |
| download | external_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
| -rw-r--r-- | WebCore/platform/graphics/android/MediaLayer.cpp | 2 | ||||
| -rw-r--r-- | 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 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 diff --git a/WebKit/android/plugins/ANPOpenGLInterface.cpp b/WebKit/android/plugins/ANPOpenGLInterface.cpp index 015a04c..839ec17 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; } |