diff options
| author | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 18:32:54 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 18:32:54 +0000 |
| commit | 589029cb1163bf74ae28b5ba7880fac6b9d099c6 (patch) | |
| tree | 81eae9bc6daff4efb4433948770016b0a3b1224f | |
| parent | 1992a2f40c0cda371d11ee5889703d1af6f5daec (diff) | |
| download | chromium_src-589029cb1163bf74ae28b5ba7880fac6b9d099c6.zip chromium_src-589029cb1163bf74ae28b5ba7880fac6b9d099c6.tar.gz chromium_src-589029cb1163bf74ae28b5ba7880fac6b9d099c6.tar.bz2 | |
Fix asserts in CC filters: m_filter or m_filters can be non-empty, but not both.
TEST=layout tests css3/filters/*-hw.html and friends
Review URL: https://chromiumcodereview.appspot.com/11175059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163613 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | cc/layer.cc | 4 | ||||
| -rw-r--r-- | cc/layer_impl.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/layer.cc b/cc/layer.cc index 975a2c1..f8953424 100644 --- a/cc/layer.cc +++ b/cc/layer.cc @@ -319,9 +319,9 @@ void Layer::setReplicaLayer(Layer* layer) void Layer::setFilters(const WebKit::WebFilterOperations& filters) { - DCHECK(!m_filter); if (m_filters == filters) return; + DCHECK(!m_filter); m_filters = filters; setNeedsCommit(); if (!filters.isEmpty()) @@ -330,9 +330,9 @@ void Layer::setFilters(const WebKit::WebFilterOperations& filters) void Layer::setFilter(SkImageFilter* filter) { - DCHECK(m_filters.isEmpty()); if (m_filter == filter) return; + DCHECK(m_filters.isEmpty()); SkRefCnt_SafeAssign(m_filter, filter); setNeedsCommit(); if (filter) diff --git a/cc/layer_impl.cc b/cc/layer_impl.cc index 1297409..96f197b 100644 --- a/cc/layer_impl.cc +++ b/cc/layer_impl.cc @@ -476,10 +476,10 @@ void LayerImpl::setBackgroundColor(SkColor backgroundColor) void LayerImpl::setFilters(const WebKit::WebFilterOperations& filters) { - DCHECK(!m_filter); if (m_filters == filters) return; + DCHECK(!m_filter); m_filters = filters; noteLayerPropertyChangedForSubtree(); } @@ -495,10 +495,10 @@ void LayerImpl::setBackgroundFilters(const WebKit::WebFilterOperations& backgrou void LayerImpl::setFilter(SkImageFilter* filter) { - DCHECK(m_filters.isEmpty()); if (m_filter == filter) return; + DCHECK(m_filters.isEmpty()); SkRefCnt_SafeAssign(m_filter, filter); noteLayerPropertyChangedForSubtree(); } |