Unreviewed build fix with GSTREAMER_GL active.
authorcalvaris@igalia.com <calvaris@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Apr 2016 15:48:18 +0000 (15:48 +0000)
committercalvaris@igalia.com <calvaris@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 5 Apr 2016 15:48:18 +0000 (15:48 +0000)
Caused by r198655.

(WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: Changed return type.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

index c77c2e4..f6648fc 100644 (file)
@@ -1,3 +1,13 @@
+2016-04-05  Xabier Rodriguez Calvar  <calvaris@igalia.com>
+
+        Unreviewed build fix with GSTREAMER_GL active.
+
+        Caused by r198655.
+
+        (WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: Changed return type.
+
 2016-04-05  Antti Koivisto  <antti@apple.com>
 
         Render tree teardown should be iterative
index 8651cdb..6b67dab 100644 (file)
@@ -662,7 +662,7 @@ void MediaPlayerPrivateGStreamerBase::paintToTextureMapper(TextureMapper& textur
 #endif
 
 #if USE(GSTREAMER_GL)
-PassNativeImagePtr MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime()
+NativeImagePtr MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime()
 {
 #if !USE(CAIRO) || !ENABLE(ACCELERATED_2D_CANVAS)
     return nullptr;
index 879e48f..b1eef1d 100644 (file)
@@ -113,7 +113,7 @@ public:
 #endif
 
 #if USE(GSTREAMER_GL)
-    PassNativeImagePtr nativeImageForCurrentTime() override;
+    NativeImagePtr nativeImageForCurrentTime() override;
 #endif
 
 protected: