Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

trunk/src/cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
@@ skipping 1053 matching lines @@
     const gfx::Transform& transform,
     gfx::Rect viewport) {
   external_transform_ = transform;
   external_viewport_ = viewport;
 }
 
 void LayerTreeHostImpl::SetNeedsRedrawRect(gfx::Rect damage_rect) {
   client_->SetNeedsRedrawRectOnImplThread(damage_rect);
 }
 
+void LayerTreeHostImpl::OnVSyncParametersChanged(base::TimeTicks timebase,
+                                                 base::TimeDelta interval) {
+  client_->OnVSyncParametersChanged(timebase, interval);
+}
+
 void LayerTreeHostImpl::BeginFrame(base::TimeTicks frame_time) {
   client_->BeginFrameOnImplThread(frame_time);
 }
 
 void LayerTreeHostImpl::OnSwapBuffersComplete(
     const CompositorFrameAck* ack) {
   // TODO(piman): We may need to do some validation on this ack before
   // processing it.
   if (ack && renderer_)
     renderer_->ReceiveSwapBuffersAck(*ack);
@@ skipping 418 matching lines @@
                                           settings_.num_raster_threads,
                                           settings_.use_color_estimator,
                                           rendering_stats_instrumentation_,
                                           using_map_image);
       UpdateTileManagerMemoryPolicy(ActualManagedMemoryPolicy());
     }
 
     resource_provider_ = resource_provider.Pass();
   }
 
-  // Setup BeginFrameEmulation if it's not supported natively
-  if (!settings_.begin_frame_scheduling_enabled) {
-    const base::TimeDelta display_refresh_interval =
-      base::TimeDelta::FromMicroseconds(
-          base::Time::kMicrosecondsPerSecond /
-          settings_.refresh_rate);
-
-    output_surface->InitializeBeginFrameEmulation(
-        proxy_->ImplThread(),
-        settings_.throttle_frame_production,
-        display_refresh_interval);
-  }
-
-  int max_frames_pending =
-      output_surface->capabilities().max_frames_pending;
-  if (max_frames_pending <= 0)
-    max_frames_pending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING;
-  output_surface->SetMaxFramesPending(max_frames_pending);
-
   output_surface_ = output_surface.Pass();
 
   if (!visible_)
     renderer_->SetVisible(visible_);
 
   client_->OnCanDrawStateChanged(CanDraw());
 
   // See note in LayerTreeImpl::UpdateDrawProperties.  Renderer needs
   // to be initialized to get max texture size.
   active_tree_->set_needs_update_draw_properties();
@@ skipping 795 matching lines @@
 }
 
 void LayerTreeHostImpl::SetDebugState(const LayerTreeDebugState& debug_state) {
   if (debug_state_.continuous_painting != debug_state.continuous_painting)
     paint_time_counter_->ClearHistory();
 
   debug_state_ = debug_state;
 }
 
 }  // namespace cc