Merge r220978 - [GTK][WPE][GSTREAMER_GL] Overriden virtual function n…

…ot marked “override” in MediaPlayerPrivateGStreamerBase.h https://bugs.webkit.org/show_bug.cgi?id=175780 Reviewed by Konstantin Tokarev. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Add missing "override" qualifier.
WebKit · Aug 28, 2017 · 362d91f · 362d91f
1 parent a2eee46
commit 362d91f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-21  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK][WPE][GSTREAMER_GL] Overriden virtual function not marked “override” in MediaPlayerPrivateGStreamerBase.h
+        https://bugs.webkit.org/show_bug.cgi?id=175780
+
+        Reviewed by Konstantin Tokarev.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: Add missing "override" qualifier.
+
 2017-08-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
 
         Followup (r220289): RenderImageResourceStyleImage code clean up

diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
@@ -149,7 +149,7 @@ class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface
 
 #if USE(TEXTURE_MAPPER_GL)
     void updateTexture(BitmapTextureGL&, GstVideoInfo&);
-    RefPtr<TextureMapperPlatformLayerProxy> proxy() const;
+    RefPtr<TextureMapperPlatformLayerProxy> proxy() const override;
     void swapBuffersIfNeeded() override;
     void pushTextureToCompositor();
 #endif