summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/nav
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-05-11 15:21:40 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-05-11 15:21:40 -0700
commit29e99f5f6697f79eb9f402175456f40c73f4fc9c (patch)
treea3f829334805e0123ee47b6d4910defae3fcd6fe /Source/WebKit/android/nav
parent8391ddb06a5b36834e8bafb36763d792c1602ace (diff)
downloadexternal_webkit-29e99f5f6697f79eb9f402175456f40c73f4fc9c.zip
external_webkit-29e99f5f6697f79eb9f402175456f40c73f4fc9c.tar.gz
external_webkit-29e99f5f6697f79eb9f402175456f40c73f4fc9c.tar.bz2
Revert "Don't draw when clip is zero."
This reverts commit 8391ddb06a5b36834e8bafb36763d792c1602ace.
Diffstat (limited to 'Source/WebKit/android/nav')
-rw-r--r--Source/WebKit/android/nav/WebView.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 59901ff..a78392b 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -698,6 +698,11 @@ class GLDrawFunctor : Functor {
if (shouldDraw)
wvInstance->updateRectsForGL();
+ if (invScreenRect.isEmpty()) {
+ // NOOP operation if viewport is empty
+ return 0;
+ }
+
WebCore::IntRect inval;
int titlebarHeight = screenRect.height() - invScreenRect.height();
@@ -706,11 +711,6 @@ class GLDrawFunctor : Functor {
info->clipRight - info->clipLeft,
info->clipBottom - info->clipTop);
- if (invScreenRect.isEmpty() || screenClip.isEmpty()) {
- // NOOP operation if screenRect or clip is empty
- return 0;
- }
-
WebCore::IntRect localInvScreenRect = invScreenRect;
if (info->isLayer) {
// When webview is on a layer, we need to use the viewport relative