diff options
| author | Mike Reed <reed@google.com> | 2010-02-15 09:13:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-15 09:13:03 -0800 |
| commit | 69e2d1d3f72ae7c5326821a60a60e558b89cb10c (patch) | |
| tree | 924fe0dd213a3c6c6b391730b2d338010aaa8751 /WebKit/android | |
| parent | 4b9fb0fdd6d505b554e2d53c4a5f403c5e44fe96 (diff) | |
| parent | 43ea3379b4eaa2af641c3fa0c2096fa10d9e6147 (diff) | |
| download | external_webkit-69e2d1d3f72ae7c5326821a60a60e558b89cb10c.zip external_webkit-69e2d1d3f72ae7c5326821a60a60e558b89cb10c.tar.gz external_webkit-69e2d1d3f72ae7c5326821a60a60e558b89cb10c.tar.bz2 | |
Merge "checkpoint for refactoring"
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 193a86e..d334589 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -1513,6 +1513,10 @@ static void nativeDrawMatches(JNIEnv *env, jobject obj, jobject canv) view->drawMatches(canvas); } +static void setXYWH(SkRect* r, SkScalar x, SkScalar y, SkScalar w, SkScalar h) { + r->set(x, y, x + w, y + h); +} + static void nativeDrawLayers(JNIEnv *env, jobject obj, jint layer, jint scrollX, jint scrollY, jint width, jint height, @@ -1528,8 +1532,13 @@ static void nativeDrawLayers(JNIEnv *env, jobject obj, #if USE(ACCELERATED_COMPOSITING) LayerAndroid* layerImpl = reinterpret_cast<LayerAndroid*>(layer); SkCanvas* canvas = GraphicsJNI::getNativeCanvas(env, canv); - if (canvas) - layerImpl->paintOn(scrollX, scrollY, width, height, scale, canvas); + if (canvas) { + SkRect viewPort; + setXYWH(&viewPort, + scrollX / scale, scrollY / scale, + width / scale, height / scale); + layerImpl->draw(canvas, &viewPort); + } #endif } |