diff options
author | John Reck <jreck@google.com> | 2012-05-03 18:20:42 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-03 18:20:42 -0700 |
commit | 897f9bc8d6e51ba1d0209f219e4c98c8565927e9 (patch) | |
tree | f86ae10ffbce9e0e2154bcf1e8f76b959ab4a737 /Source | |
parent | c896f84c19de80a82235a1ee89abe8076a91296c (diff) | |
parent | 32adb31007abb325eb77e393358d128db57c1bec (diff) | |
download | external_webkit-897f9bc8d6e51ba1d0209f219e4c98c8565927e9.zip external_webkit-897f9bc8d6e51ba1d0209f219e4c98c8565927e9.tar.gz external_webkit-897f9bc8d6e51ba1d0209f219e4c98c8565927e9.tar.bz2 |
Merge "Fix the matrix" into jb-dev
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebKit/android/jni/PicturePile.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/WebKit/android/jni/PicturePile.cpp b/Source/WebKit/android/jni/PicturePile.cpp index 9ca3588..f3e46ac 100644 --- a/Source/WebKit/android/jni/PicturePile.cpp +++ b/Source/WebKit/android/jni/PicturePile.cpp @@ -183,6 +183,7 @@ void PicturePile::updatePicture(PicturePainter* painter, PictureContainer& pc) } else { drawArea.unite(pc.prerendered->area); SkNWayCanvas* nwayCanvas = new SkNWayCanvas(drawArea.width(), drawArea.height()); + nwayCanvas->translate(-drawArea.x(), -drawArea.y()); nwayCanvas->addCanvas(canvas); nwayCanvas->addCanvas(prerender); SkSafeUnref(canvas); @@ -284,25 +285,14 @@ void PicturePile::appendToPile(const IntRect& inval, const IntRect& originalInva PrerenderedInval* PicturePile::prerenderedInvalForArea(const IntRect& area) { - ALOGV("Checking for prerendered inval for area " INT_RECT_FORMAT, - INT_RECT_ARGS(area)); for (int i = (int) m_pile.size() - 1; i >= 0; i--) { if (m_pile[i].area.intersects(area)) { RefPtr<PrerenderedInval> inval = m_pile[i].prerendered; - if (inval.get() && inval->area.contains(area)) { - ALOGV("Returning prerendered %p for area " INT_RECT_FORMAT, - m_pile[i].prerendered.get(), INT_RECT_ARGS(area)); + if (inval.get() && inval->area.contains(area)) return inval.get(); - } - if (inval.get()) { - ALOGV("Prerendered area doesn't contain requested area; prerendered=" - INT_RECT_FORMAT, INT_RECT_ARGS(inval->area)); - } else - ALOGV("No prerendered in intersection"); return 0; } } - ALOGV("No containers found"); return 0; } |