diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/cc/trees/layer_tree_host.h | |
parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/trees/layer_tree_host.h')
-rw-r--r-- | chromium/cc/trees/layer_tree_host.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/chromium/cc/trees/layer_tree_host.h b/chromium/cc/trees/layer_tree_host.h index 54000cfece0..0c3405f8cb7 100644 --- a/chromium/cc/trees/layer_tree_host.h +++ b/chromium/cc/trees/layer_tree_host.h @@ -47,7 +47,6 @@ #include "components/viz/common/resources/resource_format.h" #include "components/viz/common/surfaces/local_surface_id_allocation.h" #include "services/metrics/public/cpp/ukm_source_id.h" -#include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/rect.h" namespace gfx { @@ -239,6 +238,9 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { // StopDeferringCommits is called. std::unique_ptr<ScopedDeferMainFrameUpdate> DeferMainFrameUpdate(); + // Notification that the proxy started or stopped deferring main frame updates + void OnDeferMainFrameUpdatesChanged(bool); + // Prevents the proxy from committing the layer tree to the compositor, // while still allowing main frame lifecycle updates. |timeout| // is the interval after which commits will restart if nothing stops @@ -249,6 +251,9 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { // Stop deferring commits immediately. void StopDeferringCommits(PaintHoldingCommitTrigger); + // Notification that the proxy started or stopped deferring commits. + void OnDeferCommitsChanged(bool); + // Returns whether there are any outstanding ScopedDeferMainFrameUpdate, // though commits may be deferred also when the local_surface_id_from_parent() // is not valid. @@ -387,7 +392,7 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { return event_listener_properties_[static_cast<size_t>(event_class)]; } - void SetViewportSizeAndScale(const gfx::Size& device_viewport_size, + void SetViewportRectAndScale(const gfx::Rect& device_viewport_rect, float device_scale_factor, const viz::LocalSurfaceIdAllocation& local_surface_id_allocation_from_parent); @@ -396,7 +401,7 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { gfx::Rect viewport_visible_rect() const { return viewport_visible_rect_; } - gfx::Size device_viewport_size() const { return device_viewport_size_; } + gfx::Rect device_viewport_rect() const { return device_viewport_rect_; } void SetBrowserControlsHeight(float top_height, float bottom_height, @@ -652,6 +657,11 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { float maximum_scale, float starting_scale) override; + void OnCustomPropertyMutated( + ElementId element_id, + const std::string& custom_property_name, + PaintWorkletInput::PropertyValue custom_property_value) override {} + void ScrollOffsetAnimationFinished() override {} gfx::ScrollOffset GetScrollOffsetForAnimation( ElementId element_id) const override; @@ -814,7 +824,7 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient { LayerSelection selection_; - gfx::Size device_viewport_size_; + gfx::Rect device_viewport_rect_; gfx::Rect viewport_visible_rect_; |