Title: [216282] tags/Safari-604.1.21/Source
- Revision
- 216282
- Author
- matthew_han...@apple.com
- Date
- 2017-05-05 15:46:02 -0700 (Fri, 05 May 2017)
Log Message
Revert r216268. rdar://problem/31978703
Modified Paths
Diff
Modified: tags/Safari-604.1.21/Source/WebCore/ChangeLog (216281 => 216282)
--- tags/Safari-604.1.21/Source/WebCore/ChangeLog 2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebCore/ChangeLog 2017-05-05 22:46:02 UTC (rev 216282)
@@ -1,38 +1,21 @@
2017-05-05 Matthew Hanson <matthew_han...@apple.com>
- Cherry-pick r216229. rdar://problem/31978703
+ Revert r216268. rdar://problem/31978703
- 2017-05-04 Jeremy Jones <jere...@apple.com>
+ 2017-05-03 John Wilander <wilan...@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
+ Resource Load Statistics: Remove all statistics for modifiedSince website data removals
+ https://bugs.webkit.org/show_bug.cgi?id=171584
+ <rdar://problem/24702576>
- Reviewed by Jer Noble.
+ Reviewed by Brent Fulgham.
- No new tests because no behavior change.
+ Test: http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
- Fix build by casting result of +clearColor to UIColor.
+ * loader/ResourceLoadObserver.cpp:
+ (WebCore::ResourceLoadObserver::clearInMemoryAndPersistentStore):
+ Now clears all regardless of the modifiedSince parameter's value.
- * 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
- https://bugs.webkit.org/show_bug.cgi?id=171584
- <rdar://problem/24702576>
-
- Reviewed by Brent Fulgham.
-
- Test: http/tests/loading/resourceLoadStatistics/clear-in-memory-and-persistent-store-one-hour.html
-
- * loader/ResourceLoadObserver.cpp:
- (WebCore::ResourceLoadObserver::clearInMemoryAndPersistentStore):
- Now clears all regardless of the modifiedSince parameter's value.
-
2017-05-03 Andy Estes <aes...@apple.com>
Try to fix the macOS Public SDK build
Modified: tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (216281 => 216282)
--- tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2017-05-05 22:46:02 UTC (rev 216282)
@@ -75,11 +75,6 @@
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)
{
@@ -607,7 +602,7 @@
if (![[parentView window] _isHostedInAnotherProcess]) {
if (!m_window)
m_window = adoptNS([allocUIWindowInstance() initWithFrame:[[getUIScreenClass() mainScreen] bounds]]);
- [m_window setBackgroundColor:clearUIColor()];
+ [m_window setBackgroundColor:[getUIColorClass() clearColor]];
if (!m_viewController)
m_viewController = adoptNS([allocUIViewControllerInstance() init]);
[[m_viewController view] setFrame:[m_window bounds]];
@@ -620,7 +615,7 @@
if (!m_playerLayerView)
m_playerLayerView = adoptNS([[getWebAVPlayerLayerViewClass() alloc] init]);
[m_playerLayerView setHidden:[playerController() isExternalPlaybackActive]];
- [m_playerLayerView setBackgroundColor:clearUIColor()];
+ [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
if (!isInPictureInPictureMode) {
[m_playerLayerView setVideoView:&videoView];
@@ -651,7 +646,7 @@
[m_playerViewController view].frame = [parentView convertRect:initialRect toView:[m_playerViewController view].superview];
- [[m_playerViewController view] setBackgroundColor:clearUIColor()];
+ [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
[[m_playerViewController view] setAutoresizingMask:(UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleRightMargin)];
[[m_playerViewController view] setNeedsLayout];
@@ -753,8 +748,8 @@
[CATransaction begin];
[CATransaction setDisableActions:YES];
- [m_playerLayerView setBackgroundColor:clearUIColor()];
- [[m_playerViewController view] setBackgroundColor:clearUIColor()];
+ [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
+ [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
[CATransaction commit];
dispatch_async(dispatch_get_main_queue(), [protectedThis, this]() {
@@ -935,8 +930,8 @@
m_exitCompleted = true;
- [m_playerLayerView setBackgroundColor:clearUIColor()];
- [[m_playerViewController view] setBackgroundColor:clearUIColor()];
+ [m_playerLayerView setBackgroundColor:[getUIColorClass() clearColor]];
+ [[m_playerViewController view] setBackgroundColor:[getUIColorClass() clearColor]];
clearMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
Modified: tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog (216281 => 216282)
--- tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog 2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebKit/mac/ChangeLog 2017-05-05 22:46:02 UTC (rev 216282)
@@ -1,28 +1,16 @@
2017-05-05 Matthew Hanson <matthew_han...@apple.com>
- Cherry-pick r216229. rdar://problem/31978703
+ Revert r216268. rdar://problem/31978703
- 2017-05-04 Jeremy Jones <jere...@apple.com>
+ 2017-05-03 Joseph Pecoraro <pecor...@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
+ [Cocoa] Stop exporting symbols for ivars that were made private
+ https://bugs.webkit.org/show_bug.cgi?id=171631
- Reviewed by Jer Noble.
+ Reviewed by Dan Bernstein.
- Fix build by casting result of +whiteColor to UIColor.
+ * WebKit.exp:
- * 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
- https://bugs.webkit.org/show_bug.cgi?id=171631
-
- Reviewed by Dan Bernstein.
-
- * WebKit.exp:
-
2017-05-01 Chris Dumez <cdu...@apple.com>
Remove some usage of PassRefPtr in editing code
Modified: tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm (216281 => 216282)
--- tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm 2017-05-05 22:45:57 UTC (rev 216281)
+++ tags/Safari-604.1.21/Source/WebKit/mac/WebView/WebView.mm 2017-05-05 22:46:02 UTC (rev 216282)
@@ -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, [(UIColor *)[getUIColorClass() whiteColor] CGColor]);
+ CGContextSetFillColorWithColor(newContext, [[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
