Changeset 215447 in webkit

Timestamp:

Apr 17, 2017 8:21:36 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[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

Patch by Fujii Hironori <Fujii Hironori> on 2017-04-17
Reviewed by Simon Fraser.

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 argument.

• platform/graphics/texmap/GraphicsLayerTextureMapper.h: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/GraphicsLayerTextureMapper.cpp (modified) (1 diff)
• platform/graphics/texmap/GraphicsLayerTextureMapper.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-17  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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 Simon Fraser.
+
+        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 argument.
+        * platform/graphics/texmap/GraphicsLayerTextureMapper.h: Ditto.
+
 2017-04-17  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp

@@ -498 +498 @@
 }
 
-void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect)
+void GraphicsLayerTextureMapper::flushCompositingState(const FloatRect& rect, FlushScope)
 {
     if (!m_layer.textureMapper())

trunk/Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.h

@@ -84 +84 @@
     void setShowRepaintCounter(bool) override;
 
-    void flushCompositingState(const FloatRect&) override;
+    void flushCompositingState(const FloatRect&, FlushScope) override;
     void flushCompositingStateForThisLayerOnly() override;