diff options
author | Chris Craik <ccraik@google.com> | 2012-04-27 11:16:20 -0700 |
---|---|---|
committer | Chris Craik <ccraik@google.com> | 2012-04-27 11:46:53 -0700 |
commit | 2f1143775c1b122a6372673f75cb8e7623aa633e (patch) | |
tree | a34b81a32a54c843081ce6e96a33bca64856cfa8 /Source/WebCore | |
parent | 87431609180dfb277a94cb8b81554e8bd2ef355d (diff) | |
download | external_webkit-2f1143775c1b122a6372673f75cb8e7623aa633e.zip external_webkit-2f1143775c1b122a6372673f75cb8e7623aa633e.tar.gz external_webkit-2f1143775c1b122a6372673f75cb8e7623aa633e.tar.bz2 |
Don't crash on bad scale - DO NOT MERGE
bug:5367327
bug:5826464
Change-Id: Ic15b3c28d610ba688f8c41e0782b3d0896b61fe2
Diffstat (limited to 'Source/WebCore')
-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 a52a3fe..dc0a304 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& viewport, IntRect* invalRect, 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 |