Update from https://crrev.com/312600

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 9069b9d97d6710bf32c384f8de0aca3a3700221d..68bc1ebeb3470a5ba864fac5ff9a52da59df6cbf 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -135,6 +135,9 @@ class CC_EXPORT LayerTreeHost {
   void DeleteContentsTexturesOnImplThread(ResourceProvider* resource_provider);
   bool UpdateLayers(ResourceUpdateQueue* queue);
 
+  // Called when the compositor completed page scale animation.
+  void DidCompletePageScaleAnimation();
+
   LayerTreeHostClient* client() { return client_; }
   const base::WeakPtr<InputHandler>& GetInputHandler() {
     return input_handler_weak_ptr_;
@@ -232,8 +235,6 @@ class CC_EXPORT LayerTreeHost {
     has_transparent_background_ = transparent;
   }
 
-  void SetOverhangBitmap(const SkBitmap& bitmap);
-
   PrioritizedResourceManager* contents_texture_manager() const {
     return contents_texture_manager_.get();
   }
@@ -438,10 +439,6 @@ class CC_EXPORT LayerTreeHost {
   SkColor background_color_;
   bool has_transparent_background_;
 
-  // If set, this texture is used to fill in the parts of the screen not
-  // covered by layers.
-  scoped_ptr<ScopedUIResource> overhang_ui_resource_;
-
   typedef ScopedPtrVector<PrioritizedResource> TextureList;
   size_t partial_texture_update_requests_;
 
@@ -449,6 +446,10 @@ class CC_EXPORT LayerTreeHost {
 
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
+  // If set, then page scale animation has completed, but the client hasn't been
+  // notified about it yet.
+  bool did_complete_scale_animation_;
+
   bool in_paint_layer_contents_;
 
   static const int kTotalFramesToUseForLCDTextMetrics = 50;