summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-07-24 11:48:23 -0700
committerChris Craik <ccraik@google.com>2012-07-24 11:59:28 -0700
commitaf195d44b17acd0bf628ca5b37a10ea73a3c0a1a (patch)
tree9672d4a88067cc270bf70a5663a2d98acbec7ab6
parentf762138fb2c8ec33fe3dec8e6bfd47e459f8f6c8 (diff)
downloadexternal_webkit-af195d44b17acd0bf628ca5b37a10ea73a3c0a1a.zip
external_webkit-af195d44b17acd0bf628ca5b37a10ea73a3c0a1a.tar.gz
external_webkit-af195d44b17acd0bf628ca5b37a10ea73a3c0a1a.tar.bz2
Revert "Crash if stack is corrupted"
bug:5367327 bug:6656642 This reverts commit 874e5fbe3113052b0e3b7068d4b8df89bdeb4579 Change-Id: I0fd636bd93c47e9e21fac2ccf1996048823e893a
-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 20f5abf..256a678 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -353,10 +353,8 @@ int GLWebViewState::drawGL(IntRect& invScreenRect, SkRect& visibleContentRect,
if (ImagesManager::instance()->prepareTextures(this))
returnFlags |= DrawGlInfo::kStatusDraw;
- if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) {
+ if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING)
ALOGW("WARNING, scale seems corrupted after update: %e", scale);
- CRASH();
- }
double currentTime = setupDrawing(invScreenRect, visibleContentRect, screenRect,
titleBarHeight, screenClip, scale);