Changeset 180883 in webkit


Ignore:
Timestamp:
Mar 2, 2015 7:30:12 AM (9 years ago)
Author:
ddkilzer@apple.com
Message:

REGRESSION (r180882): Build failure: Methods not marked override in GraphicsLayerCA.h
<​http://webkit.org/b/138684>

Fixes the following build failures:

In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:39:
In file included from WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:30:
In file included from WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h:29:
WebCore.framework/PrivateHeaders/GraphicsLayerCA.h:123:33: error: 'setShapeLayerPath' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]

WEBCORE_EXPORT virtual void setShapeLayerPath(const Path&);


In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:30:
In file included from WebKit2/WebProcess/WebPage/WebPage.h:46:
In file included from WebKit2/WebProcess/Plugins/Plugin.h:31:
WebCore.framework/PrivateHeaders/GraphicsLayer.h:390:18: note: overridden virtual function is here

virtual void setShapeLayerPath(const Path&);


In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:39:
In file included from WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:30:
In file included from WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h:29:
WebCore.framework/PrivateHeaders/GraphicsLayerCA.h:124:33: error: 'setShapeLayerWindRule' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]

WEBCORE_EXPORT virtual void setShapeLayerWindRule(WindRule);


In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:30:
In file included from WebKit2/WebProcess/WebPage/WebPage.h:46:
In file included from WebKit2/WebProcess/Plugins/Plugin.h:31:
WebCore.framework/PrivateHeaders/GraphicsLayer.h:393:18: note: overridden virtual function is here

virtual void setShapeLayerWindRule(WindRule);


2 errors generated.

  • platform/graphics/ca/GraphicsLayerCA.h:

(WebCore::GraphicsLayer::setShapeLayerPath): Mark as override.
(WebCore::GraphicsLayer::setShapeLayerWindRule): Ditto.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r180882 r180883  
     12015-03-02  David Kilzer  <ddkilzer@apple.com>
     2
     3        REGRESSION (r180882): Build failure: Methods not marked override in GraphicsLayerCA.h
     4        <http://webkit.org/b/138684>
     5
     6        Fixes the following build failures:
     7
     8            In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:39:
     9            In file included from WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:30:
     10            In file included from WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h:29:
     11            WebCore.framework/PrivateHeaders/GraphicsLayerCA.h:123:33: error: 'setShapeLayerPath' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
     12                WEBCORE_EXPORT virtual void setShapeLayerPath(const Path&);
     13                                            ^
     14            In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:30:
     15            In file included from WebKit2/WebProcess/WebPage/WebPage.h:46:
     16            In file included from WebKit2/WebProcess/Plugins/Plugin.h:31:
     17            WebCore.framework/PrivateHeaders/GraphicsLayer.h:390:18: note: overridden virtual function is here
     18                virtual void setShapeLayerPath(const Path&);
     19                             ^
     20            In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:39:
     21            In file included from WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:30:
     22            In file included from WebKit2/WebProcess/WebPage/mac/GraphicsLayerCARemote.h:29:
     23            WebCore.framework/PrivateHeaders/GraphicsLayerCA.h:124:33: error: 'setShapeLayerWindRule' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
     24                WEBCORE_EXPORT virtual void setShapeLayerWindRule(WindRule);
     25                                            ^
     26            In file included from WebKit2/WebProcess/WebPage/DrawingArea.cpp:30:
     27            In file included from WebKit2/WebProcess/WebPage/WebPage.h:46:
     28            In file included from WebKit2/WebProcess/Plugins/Plugin.h:31:
     29            WebCore.framework/PrivateHeaders/GraphicsLayer.h:393:18: note: overridden virtual function is here
     30                virtual void setShapeLayerWindRule(WindRule);
     31                             ^
     32            2 errors generated.
     33
     34        * platform/graphics/ca/GraphicsLayerCA.h:
     35        (WebCore::GraphicsLayer::setShapeLayerPath): Mark as override.
     36        (WebCore::GraphicsLayer::setShapeLayerWindRule): Ditto.
     37
    1382015-03-01  Simon Fraser  <simon.fraser@apple.com>
    239

  • trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

    r180882 r180883  
    121121    WEBCORE_EXPORT virtual bool setMasksToBoundsRect(const FloatRoundedRect&) override;
    122122
    123     WEBCORE_EXPORT virtual void setShapeLayerPath(const Path&);
    124     WEBCORE_EXPORT virtual void setShapeLayerWindRule(WindRule);
     123    WEBCORE_EXPORT virtual void setShapeLayerPath(const Path&) override;
     124    WEBCORE_EXPORT virtual void setShapeLayerWindRule(WindRule) override;
    125125
    126126    WEBCORE_EXPORT virtual void suspendAnimations(double time) override;
Note: See TracChangeset for help on using the changeset viewer.