| Index: Source/platform/graphics/filters/FilterOperation.h
|
| diff --git a/Source/platform/graphics/filters/FilterOperation.h b/Source/platform/graphics/filters/FilterOperation.h
|
| index 1108f1c4c5d67916a3cc342598facd38374649c2..93bb10b6e46e4f45b7069165e0f45183eb7f85bc 100644
|
| --- a/Source/platform/graphics/filters/FilterOperation.h
|
| +++ b/Source/platform/graphics/filters/FilterOperation.h
|
| @@ -116,8 +116,8 @@ public:
|
| return adoptRef(new ReferenceFilterOperation(url, fragment));
|
| }
|
|
|
| - virtual bool affectsOpacity() const OVERRIDE { return true; }
|
| - virtual bool movesPixels() const OVERRIDE { return true; }
|
| + virtual bool affectsOpacity() const override { return true; }
|
| + virtual bool movesPixels() const override { return true; }
|
|
|
| const String& url() const { return m_url; }
|
| const AtomicString& fragment() const { return m_fragment; }
|
| @@ -126,13 +126,13 @@ public:
|
| void setFilter(PassRefPtr<ReferenceFilter> filter) { m_filter = filter; }
|
|
|
| private:
|
| - virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const OVERRIDE
|
| + virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const override
|
| {
|
| ASSERT_NOT_REACHED();
|
| return nullptr;
|
| }
|
|
|
| - virtual bool operator==(const FilterOperation& o) const OVERRIDE
|
| + virtual bool operator==(const FilterOperation& o) const override
|
| {
|
| if (!isSameType(o))
|
| return false;
|
| @@ -167,8 +167,8 @@ public:
|
|
|
|
|
| private:
|
| - virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const OVERRIDE;
|
| - virtual bool operator==(const FilterOperation& o) const OVERRIDE
|
| + virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const override;
|
| + virtual bool operator==(const FilterOperation& o) const override
|
| {
|
| if (!isSameType(o))
|
| return false;
|
| @@ -203,12 +203,12 @@ public:
|
|
|
| double amount() const { return m_amount; }
|
|
|
| - virtual bool affectsOpacity() const OVERRIDE { return m_type == OPACITY; }
|
| + virtual bool affectsOpacity() const override { return m_type == OPACITY; }
|
|
|
|
|
| private:
|
| - virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const OVERRIDE;
|
| - virtual bool operator==(const FilterOperation& o) const OVERRIDE
|
| + virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const override;
|
| + virtual bool operator==(const FilterOperation& o) const override
|
| {
|
| if (!isSameType(o))
|
| return false;
|
| @@ -242,13 +242,13 @@ public:
|
|
|
| const Length& stdDeviation() const { return m_stdDeviation; }
|
|
|
| - virtual bool affectsOpacity() const OVERRIDE { return true; }
|
| - virtual bool movesPixels() const OVERRIDE { return true; }
|
| + virtual bool affectsOpacity() const override { return true; }
|
| + virtual bool movesPixels() const override { return true; }
|
|
|
|
|
| private:
|
| - virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const OVERRIDE;
|
| - virtual bool operator==(const FilterOperation& o) const OVERRIDE
|
| + virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const override;
|
| + virtual bool operator==(const FilterOperation& o) const override
|
| {
|
| if (!isSameType(o))
|
| return false;
|
| @@ -280,13 +280,13 @@ public:
|
| int stdDeviation() const { return m_stdDeviation; }
|
| Color color() const { return m_color; }
|
|
|
| - virtual bool affectsOpacity() const OVERRIDE { return true; }
|
| - virtual bool movesPixels() const OVERRIDE { return true; }
|
| + virtual bool affectsOpacity() const override { return true; }
|
| + virtual bool movesPixels() const override { return true; }
|
|
|
|
|
| private:
|
| - virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const OVERRIDE;
|
| - virtual bool operator==(const FilterOperation& o) const OVERRIDE
|
| + virtual PassRefPtr<FilterOperation> blend(const FilterOperation* from, double progress) const override;
|
| + virtual bool operator==(const FilterOperation& o) const override
|
| {
|
| if (!isSameType(o))
|
| return false;
|
|
|