summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-09-23 16:33:32 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-23 16:33:32 -0700
commitf9809bf9acc8b8a1883affc7f589838e988fd304 (patch)
tree516acf88757751d6b417d3b80563510cd5be2eec
parent301c476ad4d477afb9fa74823d6afa3188080202 (diff)
parent874e5fbe3113052b0e3b7068d4b8df89bdeb4579 (diff)
downloadexternal_webkit-f9809bf9acc8b8a1883affc7f589838e988fd304.zip
external_webkit-f9809bf9acc8b8a1883affc7f589838e988fd304.tar.gz
external_webkit-f9809bf9acc8b8a1883affc7f589838e988fd304.tar.bz2
Merge "Crash if stack is corrupted"
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 9e0b3a9..cd93f36 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -569,8 +569,10 @@ 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();