Changeset 57403 in webkit

Timestamp:

Apr 9, 2010 7:59:27 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-09 Jer Noble <​jer.noble@apple.com>

Reviewed by Darin Adler.

Work around QTMovieView bug (<rdar://problem/7712713>) by using a QTMovieLayer instead.
​https://bugs.webkit.org/show_bug.cgi?id=37311 / <rdar://problem/7749993>

• WebView/WebVideoFullscreenController.mm: (-[WebVideoFullscreenController windowDidLoad]): (-[WebVideoFullscreenController setMediaElement:WebCore::]):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebVideoFullscreenController.mm (modified) (4 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-04-09  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Work around QTMovieView bug (<rdar://problem/7712713>) by using a QTMovieLayer instead.
+        https://bugs.webkit.org/show_bug.cgi?id=37311 / <rdar://problem/7749993>
+
+        * WebView/WebVideoFullscreenController.mm:
+        (-[WebVideoFullscreenController windowDidLoad]):
+        (-[WebVideoFullscreenController setMediaElement:WebCore::]):
+
 2010-04-09  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKit/mac/WebView/WebVideoFullscreenController.mm

@@ -38 +38 @@
 
 SOFT_LINK_FRAMEWORK(QTKit)
-SOFT_LINK_CLASS(QTKit, QTMovieView)
+SOFT_LINK_CLASS(QTKit, QTMovieLayer)
 
 SOFT_LINK_POINTER(QTKit, QTMovieRateDidChangeNotification, NSString *)
@@ -86 +86 @@
 - (void)windowDidLoad
 {
+#ifdef BUILDING_ON_TIGER
+    // WebVideoFullscreenController is not supported on Tiger:
+    ASSERT_NOT_REACHED();
+#else
     WebVideoFullscreenWindow *window = [self fullscreenWindow];
-    QTMovieView *view = [[getQTMovieViewClass() alloc] init];
-    [view setFillColor:[NSColor clearColor]];
-    [window setContentView:view];
-    [view setControllerVisible:NO];
-    [view setPreservesAspectRatio:YES];
+    QTMovieLayer *layer = [[getQTMovieLayerClass() alloc] init];
+    [[window contentView] setLayer:layer];
+    [[window contentView] setWantsLayer:YES];
     if (_mediaElement)
-        [view setMovie:_mediaElement->platformMedia().qtMovie];
+        [layer setMovie:_mediaElement->platformMedia().qtMovie];
     [window setHasShadow:YES]; // This is nicer with a shadow.
     [window setLevel:NSPopUpMenuWindowLevel-1];
-    [view release];
+    [layer release];
+#endif
 }
 
@@ -106 +109 @@
 - (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement;
 {
+#ifdef BUILDING_ON_TIGER
+    // WebVideoFullscreenController is not supported on Tiger:
+    ASSERT_NOT_REACHED();
+#else
     _mediaElement = mediaElement;
     if ([self isWindowLoaded]) {
-        QTMovieView *movieView = (QTMovieView *)[[self fullscreenWindow] contentView];
         QTMovie *movie = _mediaElement->platformMedia().qtMovie;
-
-        ASSERT(movieView && [movieView isKindOfClass:[getQTMovieViewClass() class]]);
+        QTMovieLayer *movieLayer = (QTMovieLayer *)[[[self fullscreenWindow] contentView] layer];
+
+        ASSERT(movieLayer && [movieLayer isKindOfClass:[getQTMovieLayerClass() class]]);
         ASSERT(movie);
-        [movieView setMovie:movie];
+        [movieLayer setMovie:movie];
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(rateChanged:) 
@@ -119 +126 @@
                                                    object:movie];
     }
+#endif
 }