summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-11 16:10:50 -0700
committerChris Craik <ccraik@google.com>2011-10-11 16:10:50 -0700
commitdc193f393a845e88f55ecf0055386fc4e4204537 (patch)
tree98ba245d3be4db3c364e72ebfa2b36c4e967ac2a /Source
parent8242049005e7219ea9846eff8eff3cead8e2461e (diff)
downloadexternal_webkit-dc193f393a845e88f55ecf0055386fc4e4204537.zip
external_webkit-dc193f393a845e88f55ecf0055386fc4e4204537.tar.gz
external_webkit-dc193f393a845e88f55ecf0055386fc4e4204537.tar.bz2
Revert crash on bad scale - do not merge
bug:5367327 Change-Id: I94589e007f9669fa1b43ab5cee42bfa44d9e503c
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp4
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 9f266d2..9e0ccf0 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -444,10 +444,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();