Update from https://crrev.com/314320

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 0765bb7a818e204ef1e9bbfe6a504cc9a54b8f1c..eb84c5416e1afad5e15801db78cba1214e27f44f 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -166,6 +166,7 @@ class CC_EXPORT LayerTreeHostImpl
   void SetNeedsAnimate() override;
   bool IsCurrentlyScrollingLayerAt(const gfx::Point& viewport_point,
                                    InputHandler::ScrollInputType type) override;
+  bool HaveWheelEventHandlersAt(const gfx::Point& viewport_point) override;
   bool HaveTouchEventHandlersAt(const gfx::Point& viewport_port) override;
   scoped_ptr<SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor(
       ui::LatencyInfo* latency) override;
@@ -241,7 +242,6 @@ class CC_EXPORT LayerTreeHostImpl
   void SetFullRootLayerDamage() override;
 
   // TileManagerClient implementation.
-  const std::vector<PictureLayerImpl*>& GetPictureLayers() const override;
   void NotifyReadyToActivate() override;
   void NotifyReadyToDraw() override;
   void NotifyTileStateChanged(const Tile* tile) override;
@@ -250,6 +250,11 @@ class CC_EXPORT LayerTreeHostImpl
       RasterTilePriorityQueue::Type type) override;
   scoped_ptr<EvictionTilePriorityQueue> BuildEvictionQueue(
       TreePriority tree_priority) override;
+  void SetIsLikelyToRequireADraw(bool is_likely_to_require_a_draw) override;
+
+  // Returns existing picture layers.
+  // TODO(vmpstr): Remove this, it's only used in tests.
+  const std::vector<PictureLayerImpl*>& GetPictureLayers() const;
 
   // ScrollbarAnimationControllerClient implementation.
   void PostDelayedScrollbarFade(const base::Closure& start_fade,
@@ -725,7 +730,7 @@ class CC_EXPORT LayerTreeHostImpl
   std::vector<PictureLayerImpl::Pair> picture_layer_pairs_;
 
   bool requires_high_res_to_draw_;
-  bool required_for_draw_tile_is_top_of_raster_queue_;
+  bool is_likely_to_require_a_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHostImpl);
 };