diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-20 15:55:00 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-25 13:01:37 -0700 |
| commit | bfeff6cd168c57722ca96c44f7c5caed26c98177 (patch) | |
| tree | a056657751792b8c55c7bf4e7c42b277cf2f1412 /Source/WebCore/platform/graphics/android/GLWebViewState.h | |
| parent | 2ad54828a335c8e7337ab1f1077253689630a6d2 (diff) | |
| download | external_webkit-bfeff6cd168c57722ca96c44f7c5caed26c98177.zip external_webkit-bfeff6cd168c57722ca96c44f7c5caed26c98177.tar.gz external_webkit-bfeff6cd168c57722ca96c44f7c5caed26c98177.tar.bz2 | |
DO NOT MERGE: Fix clipping issue due to webview animation(scaling)
Our visibleRect didn't respect the webview animation scaling before.
Get rid of the old code about scaling for ortho projection, we don't need it
any more since we moved onto the clip info.
Rename the viewport to visibleRect which is used more often.
bug:5684832
Change-Id: I8f49cbfd776a95073414ecc31e2fb40642e1ae0d
cherry-pick the master change:
https://android-git.corp.google.com/g/#/c/183080/
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.h b/Source/WebCore/platform/graphics/android/GLWebViewState.h index 2b28619..8d0f214 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.h +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.h @@ -177,7 +177,7 @@ public: bool setLayersRenderingMode(TexturesResult&); - int drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, + int drawGL(IntRect& rect, SkRect& visibleRect, IntRect* invalRect, IntRect& webViewRect, int titleBarHeight, IntRect& clip, float scale, bool* collectionsSwappedPtr, bool* newCollectionHasAnimPtr, |