Title: [164996] tags/Safari-538.20.1/Source/WebCore
Diff
Modified: tags/Safari-538.20.1/Source/WebCore/ChangeLog (164995 => 164996)
--- tags/Safari-538.20.1/Source/WebCore/ChangeLog 2014-03-03 19:07:53 UTC (rev 164995)
+++ tags/Safari-538.20.1/Source/WebCore/ChangeLog 2014-03-03 19:30:49 UTC (rev 164996)
@@ -1,3 +1,23 @@
+2014-03-03 Lucas Forschler <[email protected]>
+
+ Merge r164873
+
+ 2014-02-28 Jer Noble <[email protected]>
+
+ [Mac] Disambiguate calls to [[window contentView] layer] and [... setLayer:]
+ https://bugs.webkit.org/show_bug.cgi?id=129491
+
+ Reviewed by Alexey Proskuryakov.
+
+ -[NSWindow contentView] returns a bare id, leading to ambiguity when calling
+ certain methods, including -layer and -setLayer:. Resolve the ambiguity by
+ explicitly casting the -contentView call to a NSView*.
+
+ * platform/mac/WebVideoFullscreenController.mm:
+ (-[WebVideoFullscreenController setupVideoOverlay:]):
+ (-[WebVideoFullscreenController windowDidLoad]):
+ (-[WebVideoFullscreenController windowDidExitFullscreen]):
+
2014-02-27 Krzysztof Czech <[email protected]>
[ATK] Fix style errors in enum members
Modified: tags/Safari-538.20.1/Source/WebCore/platform/mac/WebVideoFullscreenController.mm (164995 => 164996)
--- tags/Safari-538.20.1/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2014-03-03 19:07:53 UTC (rev 164995)
+++ tags/Safari-538.20.1/Source/WebCore/platform/mac/WebVideoFullscreenController.mm 2014-03-03 19:30:49 UTC (rev 164996)
@@ -98,7 +98,7 @@
- (void)setupVideoOverlay:(CALayer *)layer
{
WebVideoFullscreenWindow *window = [self fullscreenWindow];
- [[window contentView] setLayer:layer];
+ [(NSView*)[window contentView] setLayer:layer];
[[window contentView] setWantsLayer:YES];
}
@@ -107,7 +107,7 @@
WebVideoFullscreenWindow *window = [self fullscreenWindow];
[window setHasShadow:YES]; // This is nicer with a shadow.
[window setLevel:NSPopUpMenuWindowLevel-1];
- [[window contentView] setLayer:[CALayer layer]];
+ [(NSView*)[window contentView] setLayer:[CALayer layer]];
[[window contentView] setWantsLayer:YES];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
@@ -171,7 +171,7 @@
- (void)windowDidExitFullscreen
{
- CALayer *layer = [[[self window] contentView] layer];
+ CALayer *layer = [(NSView*)[[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
