diff options
| author | John Reck <jreck@google.com> | 2012-04-27 13:07:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-27 13:07:05 -0700 |
| commit | 341175b92c1d65317b1326da610e8040005921c1 (patch) | |
| tree | d141e7809fc84e8e5e13eba0ff1198eabac755d7 /Source | |
| parent | 1711ae858c31e6ade43a99517f3cb5b358a2cb5f (diff) | |
| parent | 2f1143775c1b122a6372673f75cb8e7623aa633e (diff) | |
| download | external_webkit-341175b92c1d65317b1326da610e8040005921c1.zip external_webkit-341175b92c1d65317b1326da610e8040005921c1.tar.gz external_webkit-341175b92c1d65317b1326da610e8040005921c1.tar.bz2 | |
Merge "Don't crash on bad scale - DO NOT MERGE" into jb-dev
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 7a94eb5..398beea 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -334,7 +334,7 @@ int GLWebViewState::drawGL(IntRect& rect, SkRect& visibleRect, IntRect* invalRec if (scale < MIN_SCALE_WARNING || scale > MAX_SCALE_WARNING) { ALOGW("WARNING, scale seems corrupted after update: %e", scale); - CRASH(); + scale = 1.0f; // WORKAROUND for corrupted scale: use 1.0 } // gather the textures we can use |