summaryrefslogtreecommitdiffstats
path: root/cc/layers
diff options
context:
space:
mode:
Diffstat (limited to 'cc/layers')
-rw-r--r--cc/layers/delegated_renderer_layer_impl_unittest.cc2
-rw-r--r--cc/layers/layer.cc16
-rw-r--r--cc/layers/layer.h4
-rw-r--r--cc/layers/layer_impl.cc11
-rw-r--r--cc/layers/layer_impl.h4
-rw-r--r--cc/layers/layer_impl_unittest.cc10
-rw-r--r--cc/layers/render_surface_impl.cc1
7 files changed, 3 insertions, 45 deletions
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 711ef01..58fa366 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -549,7 +549,6 @@ class DelegatedRendererLayerImplTestTransform
child_pass_rect, // contents_changed_since_last_frame
gfx::RectF(), // mask_uv_rect
FilterOperations(), // filters
- skia::RefPtr<SkImageFilter>(), // filter
FilterOperations()); // background_filters
quad_sink.Append(render_pass_quad.PassAs<DrawQuad>(), &data);
@@ -951,7 +950,6 @@ class DelegatedRendererLayerImplTestClip
child_pass_rect, // contents_changed_since_last_frame
gfx::RectF(), // mask_uv_rect
FilterOperations(), // filters
- skia::RefPtr<SkImageFilter>(), // filter
FilterOperations()); // background_filters
quad_sink.Append(render_pass_quad.PassAs<DrawQuad>(), &data);
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 86887a6..238d2c3 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -123,8 +123,7 @@ void Layer::SetLayerTreeHost(LayerTreeHost* host) {
if (host && layer_animation_controller_->has_any_animation())
host->SetNeedsCommit();
- if (host &&
- (!filters_.IsEmpty() || !background_filters_.IsEmpty() || filter_))
+ if (host && (!filters_.IsEmpty() || !background_filters_.IsEmpty()))
layer_tree_host_->set_needs_filter_context();
}
@@ -472,24 +471,12 @@ void Layer::SetFilters(const FilterOperations& filters) {
DCHECK(IsPropertyChangeAllowed());
if (filters_ == filters)
return;
- DCHECK(!filter_);
filters_ = filters;
SetNeedsCommit();
if (!filters.IsEmpty() && layer_tree_host_)
layer_tree_host_->set_needs_filter_context();
}
-void Layer::SetFilter(const skia::RefPtr<SkImageFilter>& filter) {
- DCHECK(IsPropertyChangeAllowed());
- if (filter_.get() == filter.get())
- return;
- DCHECK(filters_.IsEmpty());
- filter_ = filter;
- SetNeedsCommit();
- if (filter && layer_tree_host_)
- layer_tree_host_->set_needs_filter_context();
-}
-
void Layer::SetBackgroundFilters(const FilterOperations& filters) {
DCHECK(IsPropertyChangeAllowed());
if (background_filters_ == filters)
@@ -821,7 +808,6 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
layer->SetDrawsContent(DrawsContent());
layer->SetHideLayerAndSubtree(hide_layer_and_subtree_);
layer->SetFilters(filters());
- layer->SetFilter(filter());
layer->SetBackgroundFilters(background_filters());
layer->SetMasksToBounds(masks_to_bounds_);
layer->SetShouldScrollOnMainThread(should_scroll_on_main_thread_);
diff --git a/cc/layers/layer.h b/cc/layers/layer.h
index 737e83d..9894bc2 100644
--- a/cc/layers/layer.h
+++ b/cc/layers/layer.h
@@ -124,9 +124,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
void SetFilters(const FilterOperations& filters);
const FilterOperations& filters() const { return filters_; }
- void SetFilter(const skia::RefPtr<SkImageFilter>& filter);
- skia::RefPtr<SkImageFilter> filter() const { return filter_; }
-
// Background filters are filters applied to what is behind this layer, when
// they are viewed through non-opaque regions in this layer. They are used
// through the WebLayer interface, and are not exposed to HTML.
@@ -543,7 +540,6 @@ class CC_EXPORT Layer : public base::RefCounted<Layer>,
SkColor background_color_;
CompositingReasons compositing_reasons_;
float opacity_;
- skia::RefPtr<SkImageFilter> filter_;
FilterOperations filters_;
FilterOperations background_filters_;
float anchor_point_z_;
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index b0c5399..ad9b939 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -500,7 +500,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
layer->SetDrawsContent(DrawsContent());
layer->SetHideLayerAndSubtree(hide_layer_and_subtree_);
layer->SetFilters(filters());
- layer->SetFilter(filter());
layer->SetBackgroundFilters(background_filters());
layer->SetMasksToBounds(masks_to_bounds_);
layer->SetShouldScrollOnMainThread(should_scroll_on_main_thread_);
@@ -818,7 +817,6 @@ void LayerImpl::SetFilters(const FilterOperations& filters) {
if (filters_ == filters)
return;
- DCHECK(!filter_);
filters_ = filters;
NoteLayerPropertyChangedForSubtree();
}
@@ -832,15 +830,6 @@ void LayerImpl::SetBackgroundFilters(
NoteLayerPropertyChanged();
}
-void LayerImpl::SetFilter(const skia::RefPtr<SkImageFilter>& filter) {
- if (filter_.get() == filter.get())
- return;
-
- DCHECK(filters_.IsEmpty());
- filter_ = filter;
- NoteLayerPropertyChangedForSubtree();
-}
-
void LayerImpl::SetMasksToBounds(bool masks_to_bounds) {
if (masks_to_bounds_ == masks_to_bounds)
return;
diff --git a/cc/layers/layer_impl.h b/cc/layers/layer_impl.h
index ba0ff7b..14560cc 100644
--- a/cc/layers/layer_impl.h
+++ b/cc/layers/layer_impl.h
@@ -193,9 +193,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
return background_filters_;
}
- void SetFilter(const skia::RefPtr<SkImageFilter>& filter);
- skia::RefPtr<SkImageFilter> filter() const { return filter_; }
-
void SetMasksToBounds(bool masks_to_bounds);
bool masks_to_bounds() const { return masks_to_bounds_; }
@@ -597,7 +594,6 @@ class CC_EXPORT LayerImpl : LayerAnimationValueObserver {
FilterOperations filters_;
FilterOperations background_filters_;
- skia::RefPtr<SkImageFilter> filter_;
protected:
DrawMode current_draw_mode_;
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index 3d8948a..4555bb0 100644
--- a/cc/layers/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_unittest.cc
@@ -102,8 +102,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
arbitrary_transform.Scale3d(0.1f, 0.2f, 0.3f);
FilterOperations arbitrary_filters;
arbitrary_filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
- skia::RefPtr<SkImageFilter> arbitrary_filter =
- skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
// These properties are internal, and should not be considered "change" when
// they are used.
@@ -117,7 +115,6 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetAnchorPointZ(arbitrary_number));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(arbitrary_filters));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(FilterOperations()));
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilter(arbitrary_filter));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
root->SetMaskLayer(LayerImpl::Create(host_impl.active_tree(), 4)));
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetMasksToBounds(true));
@@ -216,15 +213,12 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
arbitrary_transform.Scale3d(0.1f, 0.2f, 0.3f);
FilterOperations arbitrary_filters;
arbitrary_filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
- skia::RefPtr<SkImageFilter> arbitrary_filter =
- skia::AdoptRef(new SkBlurImageFilter(SK_Scalar1, SK_Scalar1));
// Related filter functions.
VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(FilterOperations()));
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
// Related scrolling functions.
VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMaxScrollOffset(large_vector2d));
@@ -271,7 +265,7 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) {
// Unrelated functions, set to the same values, no needs update.
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
root->SetAnchorPointZ(arbitrary_number));
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilter(arbitrary_filter));
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetFilters(arbitrary_filters));
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetMasksToBounds(true));
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetContentsOpaque(true));
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(root->SetPosition(arbitrary_point_f));
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index 3262e28..91c19a7 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -228,7 +228,6 @@ void RenderSurfaceImpl::AppendQuads(QuadSink* quad_sink,
contents_changed_since_last_frame,
mask_uv_rect,
owning_layer_->filters(),
- owning_layer_->filter(),
owning_layer_->background_filters());
quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
}
generated by cgit v1.1 at 2025-05-16 05:30:20 +0000