diff options
| author | Chris Craik <ccraik@google.com> | 2012-03-14 13:17:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-14 13:17:44 -0700 |
| commit | 3955b7b4598157904a7d4acb08b2aa6bce3af134 (patch) | |
| tree | c2438668217ca8fb9c63938acdfeedd0164d9e19 /Source/WebCore | |
| parent | b3bd98d469e54700d3ec2ab372dfab59bbb63204 (diff) | |
| parent | 644f4a9dfba2efa316c7b4d1c737af2b0554b342 (diff) | |
| download | external_webkit-3955b7b4598157904a7d4acb08b2aa6bce3af134.zip external_webkit-3955b7b4598157904a7d4acb08b2aa6bce3af134.tar.gz external_webkit-3955b7b4598157904a7d4acb08b2aa6bce3af134.tar.bz2 | |
Merge "use scale 1 when no GLWebViewState"
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index f27f2c1..7e0a719 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -269,8 +269,11 @@ void BaseLayerAndroid::updateLayerPositions(const SkRect& visibleRect) TransformationMatrix ident; compositedRoot->updateLayerPositions(visibleRect); FloatRect clip(0, 0, content()->width(), content()->height()); - compositedRoot->updateGLPositionsAndScale( - ident, clip, 1, m_state->zoomManager()->layersScale()); + + // Note that this function may be called (and should still work) with no m_state in SW mode + // TODO: is this the best thing to do in software rendering + float scale = m_state ? m_state->scale() : 1.0f; + compositedRoot->updateGLPositionsAndScale(ident, clip, 1, scale); #ifdef DEBUG compositedRoot->showLayer(0); |