diff options
| author | Bart Sears <bsears@google.com> | 2011-11-08 18:30:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 18:30:04 -0800 |
| commit | 6b0ab97afc8596ad2a5579ce6c6b6ef992ba6c0a (patch) | |
| tree | 80e946ac29db9c538a1d4078acae630e2a58889b /Source | |
| parent | c97291b2e7a966abf8dbad5cf2e0e8b033c3cd90 (diff) | |
| parent | 04b00342f70146cbe72fb47d86e83ec9cee088df (diff) | |
| download | external_webkit-6b0ab97afc8596ad2a5579ce6c6b6ef992ba6c0a.zip external_webkit-6b0ab97afc8596ad2a5579ce6c6b6ef992ba6c0a.tar.gz external_webkit-6b0ab97afc8596ad2a5579ce6c6b6ef992ba6c0a.tar.bz2 | |
Merge "Revert crash on bad scale - do not merge" into ics-mr1
Diffstat (limited to 'Source')
| -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(); |