Title: [221249] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 221249
- Author
- [email protected]
- Date
- 2017-08-28 05:46:19 -0700 (Mon, 28 Aug 2017)
Log Message
Merge r220978 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (221248 => 221249)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-28 12:44:32 UTC (rev 221248)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-28 12:46:19 UTC (rev 221249)
@@ -1,3 +1,12 @@
+2017-08-21 Adrian Perez de Castro <[email protected]>
+
+ [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 <[email protected]>
Followup (r220289): RenderImageResourceStyleImage code clean up
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (221248 => 221249)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2017-08-28 12:44:32 UTC (rev 221248)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2017-08-28 12:46:19 UTC (rev 221249)
@@ -149,7 +149,7 @@
#if USE(TEXTURE_MAPPER_GL)
void updateTexture(BitmapTextureGL&, GstVideoInfo&);
- RefPtr<TextureMapperPlatformLayerProxy> proxy() const;
+ RefPtr<TextureMapperPlatformLayerProxy> proxy() const override;
void swapBuffersIfNeeded() override;
void pushTextureToCompositor();
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
