summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/BaseTile.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2011-03-23 16:05:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-23 16:05:05 -0700
commit02e4dc4c0f1f9a35d05f3ed6de321fcc90473f44 (patch)
tree0970b03e1182a185e71c864e23e5a5bba135f6ca /WebCore/platform/graphics/android/BaseTile.cpp
parenta05c350a7e0add36d55a40d06727f964330c82a6 (diff)
parent6fd1c35298bb73147bb585e01b86d5b7c1c8f640 (diff)
downloadexternal_webkit-02e4dc4c0f1f9a35d05f3ed6de321fcc90473f44.zip
external_webkit-02e4dc4c0f1f9a35d05f3ed6de321fcc90473f44.tar.gz
external_webkit-02e4dc4c0f1f9a35d05f3ed6de321fcc90473f44.tar.bz2
am 6fd1c352: am 5bdfd148: Merge "Regression fix from bug:4136077 Plus animations improvement bug:3389597" into honeycomb-mr1
* commit '6fd1c35298bb73147bb585e01b86d5b7c1c8f640': Regression fix from bug:4136077 Plus animations improvement bug:3389597
Diffstat (limited to 'WebCore/platform/graphics/android/BaseTile.cpp')
-rw-r--r--WebCore/platform/graphics/android/BaseTile.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/platform/graphics/android/BaseTile.cpp b/WebCore/platform/graphics/android/BaseTile.cpp
index c67e2b8..391e87b 100644
--- a/WebCore/platform/graphics/android/BaseTile.cpp
+++ b/WebCore/platform/graphics/android/BaseTile.cpp
@@ -427,9 +427,15 @@ int BaseTile::paintPartialBitmap(SkIRect r, float ptx, float pty,
nCanvas->translate(tx, ty);
int pictureCount = tiledPage->paintBaseLayerContent(nCanvas);
picture.endRecording();
+
+ bool visualIndicator = TilesManager::instance()->getShowVisualIndicator();
+ if (visualIndicator)
+ canvas.save();
picture.draw(&canvas);
+ if (visualIndicator)
+ canvas.restore();
- if (TilesManager::instance()->getShowVisualIndicator()) {
+ if (visualIndicator) {
int color = 20 + pictureCount % 100;
canvas.drawARGB(color, 0, 255, 0);