Title: [216268] tags/Safari-604.1.21/Source
- Revision
- 216268
- Author
- matthew_han...@apple.com
- Date
- 2017-05-05 13:33:47 -0700 (Fri, 05 May 2017)
Log Message
Cherry-pick r216229. rdar://problem/31978703
Modified Paths
Diff
Modified: tags/Safari-604.1.21/Source/WebCore/ChangeLog (216267 => 216268)
--- tags/Safari-604.1.21/Source/WebCore/ChangeLog 2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebCore/ChangeLog 2017-05-05 20:33:47 UTC (rev 216268)
@@ -1,3 +1,24 @@
+2017-05-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r216229. rdar://problem/31978703
+
+ 2017-05-04 Jeremy Jones <jere...@apple.com>
+
+ UIColor +whiteColor and +clearColor are ambiguous and need to be casted when soft linked.
+ https://bugs.webkit.org/show_bug.cgi?id=171704
+
+ Reviewed by Jer Noble.
+
+ No new tests because no behavior change.
+
+ Fix build by casting result of +clearColor to UIColor.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+ (clearUIColor):
+ (WebVideoFullscreenInterfaceAVKit::setupFullscreen):
+ (WebVideoFullscreenInterfaceAVKit::exitFullscreen):
+ (WebVideoFullscreenInterfaceAVKit::didStopPictureInPicture):
+
2017-05-03 John Wilander <wilan...@apple.com>
Resource Load Statistics: Remove all statistics for modifiedSince website data removals
Modified: tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216267 => 216268)
--- tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-05-05 20:33:47 UTC (rev 216268)
@@ -75,6 +75,11 @@
SOFT_LINK_CLASS(UIKit, UIColor)
SOFT_LINK_CONSTANT(UIKit, UIRemoteKeyboardLevel, UIWindowLevel)
+static UIColor *clearUIColor()
+{
+ return (UIColor *)[getUIColorClass() clearColor];
+}
+
#if !LOG_DISABLED
static const char* boolString(bool val)
{
@@ -602,7 +607,7 @@
if (![[parentView window] _isHostedInAnotherProcess]) {
if (!m_window)
m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
- [m_window setBackgroundColor:[getUIColorClass() clearColor]];
+ [m_window setBackgroundColor:clearUIColor()];
if (!m_viewController)
m_viewController = adoptNS([allocUIViewControllerInstance() init]);
[[m_viewController view] setFrame:[m_window bounds]];
@@ -615,7 +620,7 @@
if (!m_playerLayerView)
m_playerLayerView = adoptNS([[getWebAVPlayerLayerViewClass() alloc] init]);
[m_playerLayerView setHidden:[playerController() isExternalPlaybackActive]];
- [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
+ [m_playerLayerView setBackgroundColor:clearUIColor()];
if (!isInPictureInPictureMode) {
[m_playerLayerView setVideoView:&videoView];
@@ -646,7 +651,7 @@
[m_playerViewController view].frame = [parentView convertRect:initialRect toView:[m_playerViewController view].superview];
- [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+ [[m_playerViewController view] setBackgroundColor:clearUIColor()];
[[m_playerViewController view] setAutoresizingMask:(UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin)];
[[m_playerViewController view] setNeedsLayout];
@@ -748,8 +753,8 @@
[CATransaction begin];
[CATransaction setDisableActions:YES];
- [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
- [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+ [m_playerLayerView setBackgroundColor:clearUIColor()];
+ [[m_playerViewController view] setBackgroundColor:clearUIColor()];
[CATransaction commit];
dispatch_async(dispatch_get_main_queue(), [protectedThis, this]() {
@@ -930,8 +935,8 @@
m_exitCompleted = true;
- [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
- [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
+ [m_playerLayerView setBackgroundColor:clearUIColor()];
+ [[m_playerViewController view] setBackgroundColor:clearUIColor()];
clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
Modified: tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog (216267 => 216268)
--- tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog 2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog 2017-05-05 20:33:47 UTC (rev 216268)
@@ -1,3 +1,19 @@
+2017-05-05 Matthew Hanson <matthew_han...@apple.com>
+
+ Cherry-pick r216229. rdar://problem/31978703
+
+ 2017-05-04 Jeremy Jones <jere...@apple.com>
+
+ UIColor +whiteColor and +clearColor are ambiguous and need to be casted when soft linked.
+ https://bugs.webkit.org/show_bug.cgi?id=171704
+
+ Reviewed by Jer Noble.
+
+ Fix build by casting result of +whiteColor to UIColor.
+
+ * WebView/WebView.mm:
+ (-[WebView _createImageWithPlatterForImage:boundingRect:contentScaleFactor:clippingRects:]):
+
2017-05-03 Joseph Pecoraro <pecor...@apple.com>
[Cocoa] Stop exporting symbols for ivars that were made private
Modified: tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm (216267 => 216268)
--- tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm 2017-05-05 20:31:56 UTC (rev 216267)
+++ tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm 2017-05-05 20:33:47 UTC (rev 216268)
@@ -1877,7 +1877,7 @@
// FIXME: This should match the background color of the text, or if the background cannot be captured as a single color, we should fall back
// to a default representation, e.g. black text on a white background.
- CGContextSetFillColorWithColor(newContext, [[getUIColorClass() whiteColor] CGColor]);
+ CGContextSetFillColorWithColor(newContext, [(UIColor *)[getUIColorClass() whiteColor] CGColor]);
for (auto textBoundingRect : scaledClippingRects)
CGContextFillRect(newContext, textBoundingRect);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
