diff options
| author | Bart Sears <bsears@google.com> | 2011-11-08 17:11:44 -0800 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2011-11-08 17:11:44 -0800 |
| commit | 04b00342f70146cbe72fb47d86e83ec9cee088df (patch) | |
| tree | c3f95cf2a8c9b53610c526ddc48574cce303edb7 | |
| parent | b15d3e9d4201362f2617955b89fbd88ecbeb06c4 (diff) | |
| download | external_webkit-04b00342f70146cbe72fb47d86e83ec9cee088df.zip external_webkit-04b00342f70146cbe72fb47d86e83ec9cee088df.tar.gz external_webkit-04b00342f70146cbe72fb47d86e83ec9cee088df.tar.bz2 | |
Revert crash on bad scale - do not merge
bug:5367327
Cherry pick of: dc193f393a845e88f55ecf0055386fc4e4204537
Change-Id: Iea6e4a564fc003d8e2ad8e1d6d9d9b64d016e43d
| -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 09e8cc4..3fb2384 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -464,10 +464,8 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, // TODO: upload as many textures as possible within a certain time limit bool ret = ImagesManager::instance()->uploadTextures(); - 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(); |