cc: Use multiple PrepareTiles approaches

cc/trees/layer_tree_host_impl.h

Index: cc/trees/layer_tree_host_impl.h
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index 5c0babe00d0d94335f123b568180d51698558789..ba19cd59eb78a645d534a4474479d3433c986e25 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -98,6 +98,7 @@ class LayerTreeHostImplClient {
   virtual void OnCanDrawStateChanged(bool can_draw) = 0;
   virtual void NotifyReadyToActivate() = 0;
   virtual void NotifyReadyToDraw() = 0;
+  virtual void SetRequiresHighResToDraw(bool required) = 0;
   // Please call these 3 functions through
   // LayerTreeHostImpl's SetNeedsRedraw(), SetNeedsRedrawRect() and
   // SetNeedsAnimate().
@@ -105,7 +106,7 @@ class LayerTreeHostImplClient {
   virtual void SetNeedsRedrawRectOnImplThread(const gfx::Rect& damage_rect) = 0;
   virtual void SetNeedsAnimateOnImplThread() = 0;
   virtual void SetNeedsCommitOnImplThread() = 0;
-  virtual void SetNeedsPrepareTilesOnImplThread() = 0;
+  virtual void SetNeedsPrepareTilesOnImplThread(bool for_commit) = 0;
   virtual void SetVideoNeedsBeginFrames(bool needs_begin_frames) = 0;
   virtual void PostAnimationEventsToMainThreadOnImplThread(
       scoped_ptr<AnimationEventsVector> events) = 0;
@@ -118,7 +119,6 @@ class LayerTreeHostImplClient {
   virtual void PostDelayedAnimationTaskOnImplThread(const base::Closure& task,
                                                     base::TimeDelta delay) = 0;
   virtual void DidActivateSyncTree() = 0;
-  virtual void DidPrepareTiles() = 0;
 
   // Called when page scale animation has completed on the impl thread.
   virtual void DidCompletePageScaleAnimationOnImplThread() = 0;
@@ -501,8 +501,10 @@ class CC_EXPORT LayerTreeHostImpl
 
   // TODO(weiliangc): Replace RequiresHighResToDraw with scheduler waits for
   // ReadyToDraw. crbug.com/469175
-  void SetRequiresHighResToDraw() { requires_high_res_to_draw_ = true; }
-  void ResetRequiresHighResToDraw() { requires_high_res_to_draw_ = false; }
+  void SetRequiresHighResToDraw(bool required) {
+    requires_high_res_to_draw_ = required;
+    client_->SetRequiresHighResToDraw(required);
+  }
   bool RequiresHighResToDraw() const { return requires_high_res_to_draw_; }
 
   // Only valid for synchronous (non-scheduled) single-threaded case.