diff options
author | Chris Craik <ccraik@google.com> | 2011-10-26 14:36:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-26 14:36:07 +0000 |
commit | f91221561daa0b57bbf41408d031c2643b769727 (patch) | |
tree | fee3159c9cb95d0194e880f5ac9509d9ec0fdea3 /Source/WebCore/platform/graphics/android/BaseLayerAndroid.h | |
parent | aae0d8559e1daa4204f41ab4ed7c9d73769af3b3 (diff) | |
parent | c43f9396708d95ecbce1f4ef65530999fab96c0d (diff) | |
download | external_webkit-f91221561daa0b57bbf41408d031c2643b769727.zip external_webkit-f91221561daa0b57bbf41408d031c2643b769727.tar.gz external_webkit-f91221561daa0b57bbf41408d031c2643b769727.tar.bz2 |
am c43f9396: Merge "Don\'t draw prefetch page if not necessary" into ics-mr1
* commit 'c43f9396708d95ecbce1f4ef65530999fab96c0d':
Don't draw prefetch page if not necessary
Diffstat (limited to 'Source/WebCore/platform/graphics/android/BaseLayerAndroid.h')
-rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.h b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.h index 09a086a..ad77013 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.h +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.h @@ -65,7 +65,7 @@ public: private: #if USE(ACCELERATED_COMPOSITING) void prefetchBasePicture(SkRect& viewport, float currentScale, - TiledPage* prefetchTiledPage); + TiledPage* prefetchTiledPage, bool draw); bool drawBasePictureInGL(SkRect& viewport, float scale, double currentTime, bool* buffersSwappedPtr); |