diff options
author | Chris Craik <ccraik@google.com> | 2012-05-17 13:02:29 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 13:02:29 -0700 |
commit | c6097fa86138b3dc74b91e12017cfab615fa0f38 (patch) | |
tree | 70253ae665064e455ae5251d6e6947a8ac3ed594 /Source/WebCore/platform/graphics/android | |
parent | 7dcc872e6ac009998881a3dcb6804e5d237097f8 (diff) | |
parent | 67c0962c1caf6386db484b4a1e916954dc0e8226 (diff) | |
download | external_webkit-c6097fa86138b3dc74b91e12017cfab615fa0f38.zip external_webkit-c6097fa86138b3dc74b91e12017cfab615fa0f38.tar.gz external_webkit-c6097fa86138b3dc74b91e12017cfab615fa0f38.tar.bz2 |
Merge "Check layer state before dereferencing" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
-rw-r--r-- | Source/WebCore/platform/graphics/android/layers/BaseLayerAndroid.cpp | 4 |
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) |