diff options
| author | Chris Craik <ccraik@google.com> | 2012-07-24 12:01:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-24 12:01:16 -0700 |
| commit | 8022f6e930a4ec412567ae611bd9afaf01a7c0c4 (patch) | |
| tree | c9231b9804df661075839993806926089627e14e | |
| parent | a6d1f58c04ea1017b0d6fb6cbc74eb1469631e16 (diff) | |
| parent | af195d44b17acd0bf628ca5b37a10ea73a3c0a1a (diff) | |
| download | external_webkit-8022f6e930a4ec412567ae611bd9afaf01a7c0c4.zip external_webkit-8022f6e930a4ec412567ae611bd9afaf01a7c0c4.tar.gz external_webkit-8022f6e930a4ec412567ae611bd9afaf01a7c0c4.tar.bz2 | |
Merge "Revert "Crash if stack is corrupted""
| -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 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); |