diff options
author | Bart Sears <bsears@google.com> | 2011-11-15 22:44:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-15 22:44:58 -0800 |
commit | fbcfce665f9a8c223c49f77eb04a407404f64ec8 (patch) | |
tree | 061844a03e033d80b856eda7aa8a9c3f8aee9217 /Source | |
parent | 292448625cf74fa0cbb6776572d5b116d2e7eb15 (diff) | |
parent | a8660794aef3191e012d11e47a18f58a89d2c3bb (diff) | |
download | external_webkit-fbcfce665f9a8c223c49f77eb04a407404f64ec8.zip external_webkit-fbcfce665f9a8c223c49f77eb04a407404f64ec8.tar.gz external_webkit-fbcfce665f9a8c223c49f77eb04a407404f64ec8.tar.bz2 |
Merge "Use the transformed clipping rect for media layers (flash plugin)" into ics-mr1
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/platform/graphics/android/MediaLayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/MediaLayer.cpp b/Source/WebCore/platform/graphics/android/MediaLayer.cpp index 7fa5ac2..0181892 100644 --- a/Source/WebCore/platform/graphics/android/MediaLayer.cpp +++ b/Source/WebCore/platform/graphics/android/MediaLayer.cpp @@ -68,7 +68,8 @@ MediaLayer::~MediaLayer() bool MediaLayer::drawGL(GLWebViewState* glWebViewState, SkMatrix& matrix) { - TilesManager::instance()->shader()->clip(drawClip()); + FloatRect clippingRect = TilesManager::instance()->shader()->rectInScreenCoord(drawClip()); + TilesManager::instance()->shader()->clip(clippingRect); // when the plugin gains focus webkit applies an outline to the // widget, which causes the layer to expand to accommodate the |