Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3407)

Unified Diff: cc/layers/layer_impl.cc

Issue 21154002: Add support for converting cc::FilterOperations into an SkImageFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index b0c5399d32e3a3fd06c1963eb585e671e52a6ca4..ad9b9395176284071c42ec49882eb1a199d48f6a 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;
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698