cc: Use multiple PrepareTiles approaches

cc/trees/thread_proxy.cc

Index: cc/trees/thread_proxy.cc
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
index 59ce0a7869a3c988802e2bf6a1f646dc150b2696..3cf73373b2d779bc3b58811ba592f2c946bdd997 100644
--- a/cc/trees/thread_proxy.cc
+++ b/cc/trees/thread_proxy.cc
@@ -394,6 +394,10 @@ void ThreadProxy::NotifyReadyToDraw() {
   impl().scheduler->NotifyReadyToDraw();
 }
 
+void ThreadProxy::SetRequiresHighResToDraw(bool required) {
+  impl().scheduler->SetRequiresHighResToDraw(required);
+}
+
 void ThreadProxy::SetNeedsCommitOnImplThread() {
   TRACE_EVENT0("cc", "ThreadProxy::SetNeedsCommitOnImplThread");
   DCHECK(IsImplThread());
@@ -510,9 +514,9 @@ void ThreadProxy::SetNeedsAnimateOnImplThread() {
   impl().scheduler->SetNeedsAnimate();
 }
 
-void ThreadProxy::SetNeedsPrepareTilesOnImplThread() {
+void ThreadProxy::SetNeedsPrepareTilesOnImplThread(bool for_commit) {
   DCHECK(IsImplThread());
-  impl().scheduler->SetNeedsPrepareTiles();
+  impl().scheduler->SetNeedsPrepareTiles(for_commit);
 }
 
 void ThreadProxy::SetNeedsRedrawRectOnImplThread(const gfx::Rect& damage_rect) {
@@ -1058,12 +1062,6 @@ DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) {
   impl().timing_history.DidStartDrawing();
   base::AutoReset<bool> mark_inside(&impl().inside_draw, true);
 
-  if (impl().layer_tree_host_impl->pending_tree()) {
-    bool update_lcd_text = false;
-    impl().layer_tree_host_impl->pending_tree()->UpdateDrawProperties(
-        update_lcd_text);
-  }
-
   // This method is called on a forced draw, regardless of whether we are able
   // to produce a frame, as the calling site on main thread is blocked until its
   // request completes, and we signal completion here. If CanDraw() is false, we
@@ -1348,7 +1346,7 @@ void ThreadProxy::RenewTreePriority() {
     // Once we enter NEW_CONTENTS_TAKES_PRIORITY mode, visible tiles on active
     // tree might be freed. We need to set RequiresHighResToDraw to ensure that
     // high res tiles will be required to activate pending tree.
-    impl().layer_tree_host_impl->SetRequiresHighResToDraw();
+    impl().layer_tree_host_impl->SetRequiresHighResToDraw(true);
     priority = NEW_CONTENT_TAKES_PRIORITY;
   }
 
@@ -1395,11 +1393,6 @@ void ThreadProxy::DidActivateSyncTree() {
       impl().last_begin_main_frame_args;
 }
 
-void ThreadProxy::DidPrepareTiles() {
-  DCHECK(IsImplThread());
-  impl().scheduler->DidPrepareTiles();
-}
-
 void ThreadProxy::DidCompletePageScaleAnimationOnImplThread() {
   DCHECK(IsImplThread());
   Proxy::MainThreadTaskRunner()->PostTask(