Bug 170928 – [WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[Fujii Hironori]

[WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods

Since http://trac.webkit.org/changeset/215410

> FAILED: Source/WebCore/CMakeFiles/WebCore.dir/platform/graphics/texmap/TextureMapperLayer.cpp.obj 
> "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Tools\MSVC\14.10.25017\bin\HostX64\x64\cl.exe"   /nologo /TP   @Source\WebCore\CMakeFiles\WebCore.dir\platform\graphics\texmap\TextureMapperLayer.cpp.obj.rsp /showIncludes /FoSource\WebCore\CMakeFiles\WebCore.dir\platform\graphics\texmap\TextureMapperLayer.cpp.obj /Fdlib64\WebCore.pdb /FS -c C:\WebKit-BuildSlave\win-cairo-release\build\Source\WebCore\platform\graphics\texmap\TextureMapperLayer.cpp
> c:\webkit-buildslave\win-cairo-release\build\source\webcore\platform\graphics\texmap\GraphicsLayerTextureMapper.h(86): error C3668: 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods

[Fujii Hironori]

Created attachment 307333 [details]
Patch

[Simon Fraser (smfr)]

Comment on attachment 307333 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=307333&action=review

> Source/WebCore/ChangeLog:11
> +        (WebCore::GraphicsLayerTextureMapper::flushCompositingState): Added the second arguent.

"arguent"

[Fujii Hironori]

Comment on attachment 307333 [details]
Patch

>Subversion Revision: 215441
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c84582531b1db89a981fb6288c045152f2175d7a..3305e2ab6d3443e9600c7470b5589e8e2444913e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>[phone]  Fujii Hironori  <[e-mail]>
>+
>+        [WinCairo] 'WebCore::GraphicsLayerTextureMapper::flushCompositingStated': method with override specifier 'override' did not override any base class methods
>+        https://bugs.webkit.org/show_bug.cgi?id=170928
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Apply the same change of CoordinatedGraphicsLayer.{cpp,h} of r215410 to GraphicsLayerTextureMapper.{cpp,h}.
>+
>+        * platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:
>+        (WebCore::GraphicsLayerTextureMapper::flushCompositingState): Added the second arguent.
>+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h: Ditto.
>+
> 2017-04-17  Alex Christensen  <[e-mail]>
> 
>         Fix CMake build.
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
>index 78a0246f7f550882c30d5fd06a24222eec80ac04..8f467822b4e38961d8a71c6314aa014de9ed4982 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
>@@ -497,7 +497,7 @@ void GraphicsLayerTextureMapper::commitLayerChanges()
>     m_changeMask = NoChanges;
> }
> 
>-void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect)
>+void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect, FlushScope)
> {
>     if (!m_layer.textureMapper())
>         return;
>diff --git a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
>index 42ed713d3e633a4c12bc874ccb5b45f5391311ad..71bfe61e0c693300af5bd3b613b10e74b4862968 100644
>--- a/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
>+++ b/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h
>@@ -83,7 +83,7 @@ public:
>     void setDebugBorder(const Color&, float width) override;
>     void setShowRepaintCounter(bool) override;
> 
>-    void flushCompositingState(const FloatRect&) override;
>+    void flushCompositingState(const FloatRect&, FlushScope) override;
>     void flushCompositingStateForThisLayerOnly() override;
> 
>     void updateBackingStoreIncludingSubLayers();

[Fujii Hironori]

Created attachment 307334 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 307334 [details]
Patch

Clearing flags on attachment: 307334

Committed r215447: <http://trac.webkit.org/changeset/215447>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.