summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-30 13:29:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 13:29:34 -0700
commit062210e813b45497ff314e667c870699804762e8 (patch)
tree22740260e3d00299a5c94a4064ece211eba2bc9a /Source/WebCore/platform/graphics/android
parent788bf66bac3805eb0d2efb09442968c3f12d97c7 (diff)
parent08241ef71160ccc36c2e104ad8c1092dc293a9d3 (diff)
downloadexternal_webkit-062210e813b45497ff314e667c870699804762e8.zip
external_webkit-062210e813b45497ff314e667c870699804762e8.tar.gz
external_webkit-062210e813b45497ff314e667c870699804762e8.tar.bz2
am 08241ef7: am e4d0c197: Merge "Draw entire layer tree in capturePicture()" into jb-dev
* commit '08241ef71160ccc36c2e104ad8c1092dc293a9d3': Draw entire layer tree in capturePicture()
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
-rw-r--r--Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index f03a140..5021c57 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -60,6 +60,7 @@ BaseLayerAndroid::BaseLayerAndroid(LayerContent* content)
void BaseLayerAndroid::getLocalTransform(SkMatrix* matrix) const
{
+ matrix->reset();
// base layer doesn't use size in transform calculation
matrix->preConcat(getMatrix());
}