Revert "[Android WebView] Fast Fallback Tick take 2"

android_webview/browser/in_process_view_renderer.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
@@ skipping 194 matching lines @@
     content::WebContents* web_contents)
     : client_(client),
       java_helper_(java_helper),
       web_contents_(web_contents),
       compositor_(NULL),
       visible_(false),
       dip_scale_(0.0),
       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),
       attached_to_window_(false),
       hardware_initialized_(false),
       hardware_failed_(false),
       last_egl_context_(NULL),
       manager_key_(g_view_renderer_manager.Get().NullKey()) {
   CHECK(web_contents_);
   web_contents_->SetUserData(kUserDataKey, new UserData(this));
@@ skipping 407 matching lines @@
 void InProcessViewRenderer::SetContinuousInvalidate(bool invalidate) {
   if (compositor_needs_continuous_invalidate_ == invalidate)
     return;
 
   TRACE_EVENT_INSTANT1("android_webview",
                        "InProcessViewRenderer::SetContinuousInvalidate",
                        TRACE_EVENT_SCOPE_THREAD,
                        "invalidate",
                        invalidate);
   compositor_needs_continuous_invalidate_ = invalidate;
-  need_fast_invalidate_ = compositor_needs_continuous_invalidate_;
   EnsureContinuousInvalidation(NULL, false);
 }
 
 void InProcessViewRenderer::SetDipScale(float dip_scale) {
   dip_scale_ = dip_scale;
   CHECK(dip_scale_ > 0);
 }
 
 void InProcessViewRenderer::SetPageScaleFactor(float page_scale_factor) {
   page_scale_factor_ = page_scale_factor;
@@ skipping 86 matching lines @@
 
     // Unretained here is safe because the callback is cancelled when
     // |fallback_tick_| is destroyed.
     fallback_tick_.Reset(base::Bind(&InProcessViewRenderer::FallbackTickFired,
                                     base::Unretained(this)));
 
     // No need to reschedule fallback tick if compositor does not need to be
     // 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));
     }
   }
 }
 
 void InProcessViewRenderer::FallbackTickFired() {
   TRACE_EVENT1("android_webview",
                "InProcessViewRenderer::FallbackTickFired",
                "compositor_needs_continuous_invalidate_",
                compositor_needs_continuous_invalidate_);
 
@@ skipping 49 matching lines @@
     base::StringAppendF(&str,
                         "surface width height: [%d %d] ",
                         draw_info->width,
                         draw_info->height);
     base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer);
   }
   return str;
 }
 
 }  // namespace android_webview