diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-04 17:20:24 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-12 08:15:25 +0000 |
commit | 8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch) | |
tree | 788d8d7549712682703a0310ca4a0f0860d4802b /chromium/cc/layers/picture_layer.cc | |
parent | 606d85f2a5386472314d39923da28c70c60dc8e7 (diff) |
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/layers/picture_layer.cc')
-rw-r--r-- | chromium/cc/layers/picture_layer.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chromium/cc/layers/picture_layer.cc b/chromium/cc/layers/picture_layer.cc index 290cf5ec6f1..455d8a71ac9 100644 --- a/chromium/cc/layers/picture_layer.cc +++ b/chromium/cc/layers/picture_layer.cc @@ -51,13 +51,16 @@ std::unique_ptr<LayerImpl> PictureLayer::CreateLayerImpl( return PictureLayerImpl::Create(tree_impl, id()); } -void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) { +void PictureLayer::PushPropertiesTo( + LayerImpl* base_layer, + const CommitState& commit_state, + const ThreadUnsafeCommitState& unsafe_state) { // TODO(enne): http://crbug.com/918126 debugging CHECK(this); PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer); - Layer::PushPropertiesTo(base_layer); + Layer::PushPropertiesTo(base_layer, commit_state, unsafe_state); TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"), "PictureLayer::PushPropertiesTo"); DropRecordingSourceContentIfInvalid( @@ -65,7 +68,7 @@ void PictureLayer::PushPropertiesTo(LayerImpl* base_layer) { layer_impl->SetNearestNeighbor(picture_layer_inputs_.nearest_neighbor); layer_impl->set_gpu_raster_max_texture_size( - layer_tree_host()->device_viewport_rect().size()); + commit_state.device_viewport_rect.size()); layer_impl->SetIsBackdropFilterMask(is_backdrop_filter_mask()); layer_impl->SetDirectlyCompositedImageSize( picture_layer_inputs_.directly_composited_image_size); @@ -184,7 +187,7 @@ bool PictureLayer::Update() { return updated; } -sk_sp<SkPicture> PictureLayer::GetPicture() const { +sk_sp<const SkPicture> PictureLayer::GetPicture() const { if (!DrawsContent() || bounds().IsEmpty()) return nullptr; @@ -231,7 +234,7 @@ void PictureLayer::RunMicroBenchmark(MicroBenchmark* benchmark) { } void PictureLayer::CaptureContent(const gfx::Rect& rect, - std::vector<NodeInfo>* content) { + std::vector<NodeInfo>* content) const { if (!DrawsContent()) return; @@ -295,7 +298,7 @@ void PictureLayer::DropRecordingSourceContentIfInvalid( } } -const DisplayItemList* PictureLayer::GetDisplayItemList() { +const DisplayItemList* PictureLayer::GetDisplayItemList() const { return picture_layer_inputs_.display_list.get(); } |