diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-11 17:21:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-11 17:21:03 -0700 |
| commit | 47f387fdb2c9e81ee710f41b1e79f1419817801a (patch) | |
| tree | 66cd539332c59a31b19d6b97d4d8d7f5cf201eed /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 144926737b2b4e6f76f5c6347db3093b8a483e21 (diff) | |
| parent | dc193f393a845e88f55ecf0055386fc4e4204537 (diff) | |
| download | external_webkit-47f387fdb2c9e81ee710f41b1e79f1419817801a.zip external_webkit-47f387fdb2c9e81ee710f41b1e79f1419817801a.tar.gz external_webkit-47f387fdb2c9e81ee710f41b1e79f1419817801a.tar.bz2 | |
Merge "Revert crash on bad scale - do not merge" into ics-mr0
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 113ccde..b096c20 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -445,10 +445,8 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // the BaseTiles' texture. TilesManager::instance()->transferQueue()->updateDirtyBaseTiles(); - if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) { + if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) XLOGC("WARNING, scale seems corrupted after update: %e", scale); - CRASH(); - } // gather the textures we can use TilesManager::instance()->gatherLayerTextures(); |