diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/cc/layers/render_surface_impl.h | |
parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/cc/layers/render_surface_impl.h')
-rw-r--r-- | chromium/cc/layers/render_surface_impl.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chromium/cc/layers/render_surface_impl.h b/chromium/cc/layers/render_surface_impl.h index 58ae7f85a9e..15dd8c98384 100644 --- a/chromium/cc/layers/render_surface_impl.h +++ b/chromium/cc/layers/render_surface_impl.h @@ -11,7 +11,6 @@ #include <string> #include <vector> -#include "base/macros.h" #include "cc/cc_export.h" #include "cc/layers/draw_mode.h" #include "cc/layers/layer_collections.h" @@ -35,8 +34,11 @@ class LayerTreeImpl; class CC_EXPORT RenderSurfaceImpl { public: RenderSurfaceImpl(LayerTreeImpl* layer_tree_impl, uint64_t stable_id); + RenderSurfaceImpl(const RenderSurfaceImpl&) = delete; virtual ~RenderSurfaceImpl(); + RenderSurfaceImpl& operator=(const RenderSurfaceImpl&) = delete; + // Returns the RenderSurfaceImpl that this render surface contributes to. Root // render surface's render_target is itself. RenderSurfaceImpl* render_target(); @@ -51,6 +53,13 @@ class CC_EXPORT RenderSurfaceImpl { } float draw_opacity() const { return draw_properties_.draw_opacity; } + void SetRoundedCornerRRect(const gfx::RRectF& rounded_corner_bounds) { + draw_properties_.rounded_corner_bounds = rounded_corner_bounds; + } + const gfx::RRectF& rounded_corner_bounds() const { + return draw_properties_.rounded_corner_bounds; + } + SkBlendMode BlendMode() const; bool UsesDefaultBlendMode() const; @@ -218,6 +227,11 @@ class CC_EXPORT RenderSurfaceImpl { // True if the surface needs to be clipped by clip_rect. bool is_clipped : 1; + + // Contains a rounded corner rect to clip this render surface by when + // drawing. This rrect is in the target space of the render surface. The + // root render surface will never have this set. + gfx::RRectF rounded_corner_bounds; }; DrawProperties draw_properties_; @@ -240,8 +254,6 @@ class CC_EXPORT RenderSurfaceImpl { const RenderSurfaceImpl* nearest_occlusion_immune_ancestor_; std::unique_ptr<DamageTracker> damage_tracker_; - - DISALLOW_COPY_AND_ASSIGN(RenderSurfaceImpl); }; } // namespace cc |