| 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;
|
|
|