summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-30 13:27:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 13:27:13 -0700
commit08241ef71160ccc36c2e104ad8c1092dc293a9d3 (patch)
tree4b5beb48cd6877c4bd261e2eba086f9ddae1dea0 /Source/WebCore
parent97a832f0097d2baa671692d428a2897277f9a539 (diff)
parente4d0c1973ec857d1408499010dca9f6856cecdd1 (diff)
downloadexternal_webkit-08241ef71160ccc36c2e104ad8c1092dc293a9d3.zip
external_webkit-08241ef71160ccc36c2e104ad8c1092dc293a9d3.tar.gz
external_webkit-08241ef71160ccc36c2e104ad8c1092dc293a9d3.tar.bz2
am e4d0c197: Merge "Draw entire layer tree in capturePicture()" into jb-dev
* commit 'e4d0c1973ec857d1408499010dca9f6856cecdd1': Draw entire layer tree in capturePicture()
Diffstat (limited to 'Source/WebCore')
-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());
}