diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:41:59 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:41:59 -0500 |
| commit | faf2b5dab67cbe9c5a9244f3912e916d0184f765 (patch) | |
| tree | 752c1c74fbbc2686cdb540cb8cbe0176e3da37bf /Source/WebKit/android/nav/WebView.cpp | |
| parent | 97fafc16fc2fa715dd78f611c0ebe33a64e53f88 (diff) | |
| parent | 6f1bf086c7d24634eb00a62d5af024bda7b06365 (diff) | |
| download | external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.zip external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.tar.gz external_webkit-faf2b5dab67cbe9c5a9244f3912e916d0184f765.tar.bz2 | |
resolved conflicts for merge of 6f1bf086 to master
Change-Id: I104f02e5e6ec50c002a2bdc960b428ece13528dd
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index c12adb5..b0c06b9 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -490,7 +490,7 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, // Make sure we have valid coordinates. We might not have valid coords // if the zoom manager is still initializing. We will be redrawn // once the correct scale is set - if (!m_visibleRect.hasValidCoordinates()) + if (!m_visibleRect.isFinite()) return false; bool treesSwapped = false; bool newTreeHasAnim = false; |