diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/cc/trees/layer_tree_host_impl.h | |
parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_impl.h')
-rw-r--r-- | chromium/cc/trees/layer_tree_host_impl.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chromium/cc/trees/layer_tree_host_impl.h b/chromium/cc/trees/layer_tree_host_impl.h index a8188a89ed4..a215f1cb908 100644 --- a/chromium/cc/trees/layer_tree_host_impl.h +++ b/chromium/cc/trees/layer_tree_host_impl.h @@ -18,7 +18,6 @@ #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" #include "base/macros.h" -#include "base/memory/memory_coordinator_client.h" #include "base/memory/memory_pressure_listener.h" #include "base/sequenced_task_runner.h" #include "base/time/time.h" @@ -171,8 +170,7 @@ class CC_EXPORT LayerTreeHostImpl public ScrollbarAnimationControllerClient, public VideoFrameControllerClient, public MutatorHostClient, - public base::SupportsWeakPtr<LayerTreeHostImpl>, - public base::MemoryCoordinatorClient { + public base::SupportsWeakPtr<LayerTreeHostImpl> { public: // This structure is used to build all the state required for producing a // single CompositorFrame. The |render_passes| list becomes the set of @@ -788,7 +786,12 @@ class CC_EXPORT LayerTreeHostImpl ScrollState* scroll_state, ScrollNode* scrolling_node, InputHandler::ScrollInputType type); - bool IsInitialScrollHitTestReliable(LayerImpl* layer, const gfx::PointF&); + bool IsTouchDraggingScrollbar( + LayerImpl* first_scrolling_layer_or_drawn_scrollbar, + InputHandler::ScrollInputType type); + bool IsInitialScrollHitTestReliable( + LayerImpl* layer, + LayerImpl* first_scrolling_layer_or_drawn_scrollbar); void DistributeScrollDelta(ScrollState* scroll_state); bool AnimatePageScale(base::TimeTicks monotonic_time); @@ -877,11 +880,6 @@ class CC_EXPORT LayerTreeHostImpl // active tree. void ActivateStateForImages(); - // Overriden from base::MemoryCoordinatorClient. - void OnPurgeMemory() override; - - // TODO(gyuyoung): OnMemoryPressure is deprecated. So this should be removed - // when the memory coordinator is enabled by default. void OnMemoryPressure( base::MemoryPressureListener::MemoryPressureLevel level); |