Title: [151643] trunk/Source/WebCore
- Revision
- 151643
- Author
- [email protected]
- Date
- 2013-06-17 08:26:24 -0700 (Mon, 17 Jun 2013)
Log Message
[Mac] Remove unmaintained GStreamer specific video code.
https://bugs.webkit.org/show_bug.cgi?id=117694
Reviewed by Philippe Normand.
No new tests, no behaviour change.
* platform/mac/WebVideoFullscreenController.mm:
(-[WebVideoFullscreenController setupVideoOverlay:]):
(-[WebVideoFullscreenController windowDidLoad]):
(-[WebVideoFullscreenController setMediaElement:]):
(-[WebVideoFullscreenController windowDidExitFullscreen]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151642 => 151643)
--- trunk/Source/WebCore/ChangeLog 2013-06-17 14:35:05 UTC (rev 151642)
+++ trunk/Source/WebCore/ChangeLog 2013-06-17 15:26:24 UTC (rev 151643)
@@ -1,5 +1,20 @@
2013-06-17 Michael Brüning <[email protected]>
+ [Mac] Remove unmaintained GStreamer specific video code.
+ https://bugs.webkit.org/show_bug.cgi?id=117694
+
+ Reviewed by Philippe Normand.
+
+ No new tests, no behaviour change.
+
+ * platform/mac/WebVideoFullscreenController.mm:
+ (-[WebVideoFullscreenController setupVideoOverlay:]):
+ (-[WebVideoFullscreenController windowDidLoad]):
+ (-[WebVideoFullscreenController setMediaElement:]):
+ (-[WebVideoFullscreenController windowDidExitFullscreen]):
+
+2013-06-17 Michael Brüning <[email protected]>
+
[Qt] Remove Qt specific QTKIT flagged code.
https://bugs.webkit.org/show_bug.cgi?id=117635
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (151642 => 151643)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2013-06-17 14:35:05 UTC (rev 151642)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2013-06-17 15:26:24 UTC (rev 151643)
@@ -39,10 +39,6 @@
#import <WebCore/SoftLinking.h>
#import <objc/runtime.h>
-#if USE(GSTREAMER)
-#import <WebCore/GStreamerGWorld.h>
-#endif
-
using namespace WebCore;
SOFT_LINK_FRAMEWORK(QTKit)
@@ -102,16 +98,8 @@
- (void)setupVideoOverlay:(CALayer *)layer
{
WebVideoFullscreenWindow *window = [self fullscreenWindow];
-#if USE(GSTREAMER)
- if (_mediaElement && _mediaElement->platformMedia().type == PlatformMedia::GStreamerGWorldType) {
- GStreamerGWorld* gstGworld = _mediaElement->platformMedia().media.gstreamerGWorld;
- if (gstGworld->enterFullscreen())
- [window setContentView:gstGworld->platformVideoWindow()->window()];
- }
-#else
[[window contentView] setLayer:layer];
[[window contentView] setWantsLayer:YES];
-#endif
}
- (void)windowDidLoad
@@ -122,10 +110,8 @@
[[window contentView] setLayer:[CALayer layer]];
[[window contentView] setWantsLayer:YES];
-#if !USE(GSTREAMER)
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
-#endif
}
- (HTMLMediaElement*)mediaElement
@@ -147,12 +133,10 @@
[layer setMovie:movie];
[self setupVideoOverlay:layer];
-#if !USE(GSTREAMER)
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(rateChanged:)
name:QTMovieRateDidChangeNotification
object:movie];
-#endif
} else if (_mediaElement->platformMedia().type == PlatformMedia::AVFoundationMediaPlayerType) {
AVPlayer *player = _mediaElement->platformMedia().media.avfMediaPlayer;
@@ -187,10 +171,6 @@
- (void)windowDidExitFullscreen
{
-#if USE(GSTREAMER)
- if (_mediaElement && _mediaElement->platformMedia().type == PlatformMedia::GStreamerGWorldType)
- _mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen();
-#endif
CALayer *layer = [[[self window] contentView] layer];
if ([layer isKindOfClass:getAVPlayerLayerClass()])
[[(AVPlayerLayer*)layer player] removeObserver:self forKeyPath:@"rate"];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
