summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-21 12:41:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-21 12:41:15 -0700
commit16f62dbbdf438efbcf522034c652d0fad819b4d6 (patch)
tree623f4f1255afe40643892413fbe2fe2d78ad0e50 /Source/WebCore
parent56ebbde4b2e0d396f1ef70d439d7c036e90829ee (diff)
parent52499cf37d4d6b13e4c8a8cde4e4058dcd77aa49 (diff)
downloadexternal_webkit-16f62dbbdf438efbcf522034c652d0fad819b4d6.zip
external_webkit-16f62dbbdf438efbcf522034c652d0fad819b4d6.tar.gz
external_webkit-16f62dbbdf438efbcf522034c652d0fad819b4d6.tar.bz2
am 52499cf3: am c6097fa8: Merge "Check layer state before dereferencing" into jb-dev
* commit '52499cf37d4d6b13e4c8a8cde4e4058dcd77aa49': Check layer state before dereferencing
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
index 3239599..3241a61 100644
--- a/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp
@@ -80,7 +80,9 @@ void BaseLayerAndroid::updatePositionsRecursive(const SkRect& visibleContentRect
updateLayerPositions(visibleContentRect);
TransformationMatrix ident;
FloatRect clip(0, 0, getWidth(), getHeight());
- updateGLPositionsAndScale(ident, clip, 1, state()->scale());
+
+ float scale = state() ? state()->scale() : 1.0f;
+ updateGLPositionsAndScale(ident, clip, 1, scale);
}
ForegroundBaseLayerAndroid::ForegroundBaseLayerAndroid(LayerContent* content)