summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 00:45:20 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-19 00:45:20 +0000
commit489c9946e37dcd992d703c3ec056fe866a9f19b5 (patch)
tree09b8937eb43e9744795522e6fb6d24785c9b6d5f /android_webview
parente00bab02826a261b4b0d1434671802d311b56a5b (diff)
downloadchromium_src-489c9946e37dcd992d703c3ec056fe866a9f19b5.zip
chromium_src-489c9946e37dcd992d703c3ec056fe866a9f19b5.tar.gz
chromium_src-489c9946e37dcd992d703c3ec056fe866a9f19b5.tar.bz2
Revert "[Android WebView] Fast Fallback Tick take 2"
Original commit at r216632. This is causing more problem than it is fixing because of the random clip and transform of the fallback tick is messing with the tiling and scheduling policy. These are more serious than the original problem it was trying to solve, to make progress faster for an offscreen webview. BUG=275226 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/23086003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/browser/in_process_view_renderer.cc12
-rw-r--r--android_webview/browser/in_process_view_renderer.h7
2 files changed, 2 insertions, 17 deletions
diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc
index 39614d3..0db33378 100644
--- a/android_webview/browser/in_process_view_renderer.cc
+++ b/android_webview/browser/in_process_view_renderer.cc
@@ -212,7 +212,6 @@ InProcessViewRenderer::InProcessViewRenderer(
page_scale_factor_(1.0),
on_new_picture_enable_(false),
compositor_needs_continuous_invalidate_(false),
- need_fast_invalidate_(false),
block_invalidates_(false),
width_(0),
height_(0),
@@ -640,7 +639,6 @@ void InProcessViewRenderer::SetContinuousInvalidate(bool invalidate) {
"invalidate",
invalidate);
compositor_needs_continuous_invalidate_ = invalidate;
- need_fast_invalidate_ = compositor_needs_continuous_invalidate_;
EnsureContinuousInvalidation(NULL, false);
}
@@ -747,17 +745,11 @@ void InProcessViewRenderer::EnsureContinuousInvalidation(
// ticked. This can happen if this is reached because
// invalidate_ignore_compositor is true.
if (compositor_needs_continuous_invalidate_) {
- int64 delay_in_ms = kFallbackTickTimeoutInMilliseconds;
- if (need_fast_invalidate_) {
- TRACE_EVENT_INSTANT0(
- "android_webview", "FastFallbackTick", TRACE_EVENT_SCOPE_THREAD);
- delay_in_ms = 0;
- need_fast_invalidate_ = false;
- }
base::MessageLoop::current()->PostDelayedTask(
FROM_HERE,
fallback_tick_.callback(),
- base::TimeDelta::FromMilliseconds(delay_in_ms));
+ base::TimeDelta::FromMilliseconds(
+ kFallbackTickTimeoutInMilliseconds));
}
}
}
diff --git a/android_webview/browser/in_process_view_renderer.h b/android_webview/browser/in_process_view_renderer.h
index e86796f..2ca0f88 100644
--- a/android_webview/browser/in_process_view_renderer.h
+++ b/android_webview/browser/in_process_view_renderer.h
@@ -126,13 +126,6 @@ class InProcessViewRenderer : public BrowserViewRenderer,
// states.
bool compositor_needs_continuous_invalidate_;
- // If this is true, then the fallback tick is posted with zero delay. This
- // is to reduce the time in cases when blink main thread is blocked waiting.
- // This is set when |compositor_needs_continuous_invalidate_| is set.
- // Eventually, this should correspond to BeginFrame when BeginFrame and
- // BeginFrameDeadline are separate functions.
- bool need_fast_invalidate_;
-
// Used to block additional invalidates while one is already pending or before
// compositor draw which may switch continuous_invalidate on and off in the
// process.