Diff
Modified: trunk/Source/WebCore/ChangeLog (237404 => 237405)
--- trunk/Source/WebCore/ChangeLog 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebCore/ChangeLog 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1,3 +1,16 @@
+2018-10-24 Alexey Proskuryakov <[email protected]>
+
+ Clean up some obsolete macOS version guards
+ https://bugs.webkit.org/show_bug.cgi?id=190887
+
+ Reviewed by Dan Bernstein.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::didPassCORSAccessCheck const):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::wouldTaintOrigin const):
+
2018-10-24 Tim Horton <[email protected]>
Attachment filenames with RTL characters should format similar to Finder
Modified: trunk/Source/WebCore/PAL/ChangeLog (237404 => 237405)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1,3 +1,12 @@
+2018-10-24 Alexey Proskuryakov <[email protected]>
+
+ Clean up some obsolete macOS version guards
+ https://bugs.webkit.org/show_bug.cgi?id=190887
+
+ Reviewed by Dan Bernstein.
+
+ * pal/spi/mac/TUCallSPI.h:
+
2018-10-24 Megan Gardner <[email protected]>
Turn on Conic Gradients
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h (237404 => 237405)
--- trunk/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/TUCallSPI.h 2018-10-25 00:19:22 UTC (rev 237405)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#if PLATFORM(MAC)
#import <objc/runtime.h>
#import <wtf/SoftLinking.h>
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (237404 => 237405)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -965,7 +965,6 @@
AVAssetResourceLoader *resourceLoader = m_avAsset.get().resourceLoader;
[resourceLoader setDelegate:m_loaderDelegate.get() queue:globalLoaderDelegateQueue()];
-#if PLATFORM(IOS_FAMILY) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
if (DeprecatedGlobalSettings::isAVFoundationNSURLSessionEnabled()
&& [resourceLoader respondsToSelector:@selector(setURLSession:)]
&& [resourceLoader respondsToSelector:@selector(URLSessionDataDelegate)]
@@ -974,7 +973,6 @@
if (mediaResourceLoader)
resourceLoader.URLSession = (NSURLSession *)[[[WebCoreNSURLSession alloc] initWithResourceLoader:*mediaResourceLoader delegate:resourceLoader.URLSessionDataDelegate delegateQueue:resourceLoader.URLSessionDataDelegateQueue] autorelease];
}
-#endif
#endif
@@ -1850,11 +1848,7 @@
double MediaPlayerPrivateAVFoundationObjC::maximumDurationToCacheMediaTime() const
{
-#if PLATFORM(IOS_FAMILY) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1010
return 0;
-#else
- return 5;
-#endif
}
void MediaPlayerPrivateAVFoundationObjC::updateVideoLayerGravity()
@@ -2203,7 +2197,6 @@
bool MediaPlayerPrivateAVFoundationObjC::didPassCORSAccessCheck() const
{
-#if PLATFORM(IOS_FAMILY) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
AVAssetResourceLoader *resourceLoader = m_avAsset.get().resourceLoader;
if (!DeprecatedGlobalSettings::isAVFoundationNSURLSessionEnabled()
|| ![resourceLoader respondsToSelector:@selector(URLSession)])
@@ -2212,13 +2205,12 @@
WebCoreNSURLSession *session = (WebCoreNSURLSession *)resourceLoader.URLSession;
if ([session isKindOfClass:[WebCoreNSURLSession class]])
return session.didPassCORSAccessChecks;
-#endif
+
return false;
}
std::optional<bool> MediaPlayerPrivateAVFoundationObjC::wouldTaintOrigin(const SecurityOrigin& origin) const
{
-#if PLATFORM(IOS_FAMILY) || __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
AVAssetResourceLoader *resourceLoader = m_avAsset.get().resourceLoader;
if (!DeprecatedGlobalSettings::isAVFoundationNSURLSessionEnabled()
|| ![resourceLoader respondsToSelector:@selector(URLSession)])
@@ -2227,7 +2219,7 @@
WebCoreNSURLSession *session = (WebCoreNSURLSession *)resourceLoader.URLSession;
if ([session isKindOfClass:[WebCoreNSURLSession class]])
return [session wouldTaintOrigin:origin];
-#endif
+
return std::nullopt;
}
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (237404 => 237405)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2018-10-25 00:19:22 UTC (rev 237405)
@@ -129,7 +129,7 @@
static CGColorSpaceRef displayP3ColorSpace;
static std::once_flag onceFlag;
std::call_once(onceFlag, [] {
-#if PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101100)
+#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
displayP3ColorSpace = CGColorSpaceCreateWithName(kCGColorSpaceDisplayP3);
#else
displayP3ColorSpace = sRGBColorSpaceRef();
Modified: trunk/Source/WebKit/ChangeLog (237404 => 237405)
--- trunk/Source/WebKit/ChangeLog 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKit/ChangeLog 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1,3 +1,14 @@
+2018-10-24 Alexey Proskuryakov <[email protected]>
+
+ Clean up some obsolete macOS version guards
+ https://bugs.webkit.org/show_bug.cgi?id=190887
+
+ Reviewed by Dan Bernstein.
+
+ * PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+
2018-10-24 Megan Gardner <[email protected]>
Turn on Conic Gradients
Modified: trunk/Source/WebKit/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in (237404 => 237405)
--- trunk/Source/WebKit/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKit/PluginProcess/mac/com.apple.WebKit.plugin-common.sb.in 2018-10-25 00:19:22 UTC (rev 237405)
@@ -330,7 +330,7 @@
(home-literal "/Library/Preferences/com.apple.lookup.shared.plist"))
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101300
;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
(allow file-read-data file-read-metadata file-write-data
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (237404 => 237405)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -205,14 +205,7 @@
parameters.fontWhitelist = m_fontWhitelist;
if (m_bundleParameters) {
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
- auto data = "" alloc] init]);
- auto keyedArchiver = adoptNS([[NSKeyedArchiver alloc] initForWritingWithMutableData:data.get()]);
-
- [keyedArchiver setRequiresSecureCoding:YES];
-#else
auto keyedArchiver = secureArchiver();
-#endif
@try {
[keyedArchiver encodeObject:m_bundleParameters.get() forKey:@"parameters"];
@@ -221,9 +214,7 @@
LOG_ERROR("Failed to encode bundle parameters: %@", exception);
}
-#if (!PLATFORM(MAC) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200)
auto data = ""
-#endif
parameters.bundleParameterData = API::Data::createWithoutCopying(WTFMove(data));
}
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1,3 +1,20 @@
+2018-10-24 Alexey Proskuryakov <[email protected]>
+
+ Clean up some obsolete macOS version guards
+ https://bugs.webkit.org/show_bug.cgi?id=190887
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebNSPasteboardExtras.mm:
+ (+[NSPasteboard _web_dragTypesForURL]):
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::show):
+ * WebCoreSupport/WebEditorClient.h:
+ * WebCoreSupport/WebEditorClient.mm:
+ (WebEditorClient::respondToChangedSelection):
+ * WebView/WebPDFView.mm:
+ (-[WebPDFView _clipViewForPDFDocumentView]):
+
2018-10-24 Megan Gardner <[email protected]>
Turn on Conic Gradients
Modified: trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/Misc/WebNSPasteboardExtras.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -113,9 +113,7 @@
WebURLNamePboardType,
legacyStringPasteboardType(),
legacyFilenamesPasteboardType(),
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
legacyFilesPromisePasteboardType(),
-#endif
nil];
}
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/PopupMenuMac.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -167,23 +167,15 @@
auto defaultFont = adoptCF(CTFontCreateUIFontForLanguage(kCTFontUIFontSystem, CTFontGetSize(font), nil));
vertOffset += CTFontGetDescent(font) - CTFontGetDescent(defaultFont.get());
vertOffset = fminf(NSHeight(r), vertOffset);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
if (textDirection == TextDirection::LTR)
location = NSMakePoint(NSMinX(r) + popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
else
location = NSMakePoint(NSMaxX(r) - popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
-#else
- location = NSMakePoint(NSMinX(r) + popOverHorizontalAdjust, NSMaxY(r) - vertOffset);
-#endif
} else {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
if (textDirection == TextDirection::LTR)
location = NSMakePoint(NSMinX(r) + popUnderHorizontalAdjust, NSMaxY(r) + popUnderVerticalAdjust);
else
location = NSMakePoint(NSMaxX(r) - popUnderHorizontalAdjust, NSMaxY(r) + popUnderVerticalAdjust);
-#else
- location = NSMakePoint(NSMinX(r) + popUnderHorizontalAdjust, NSMaxY(r) + popUnderVerticalAdjust);
-#endif
}
// Save the current event that triggered the popup, so we can clean up our event
// state after the NSMenu goes away.
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.h 2018-10-25 00:19:22 UTC (rev 237405)
@@ -165,7 +165,7 @@
void setInputMethodState(bool enabled) final;
void requestCheckingOfString(WebCore::TextCheckingRequest&, const WebCore::VisibleSelection& currentSelection) final;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC)
void requestCandidatesForSelection(const WebCore::VisibleSelection&) final;
void handleRequestedCandidates(NSInteger, NSArray<NSTextCheckingResult *> *);
void handleAcceptedCandidateWithSoftSpaces(WebCore::TextCheckingResult) final;
@@ -185,7 +185,7 @@
WebCore::VisibleSelection m_lastSelectionForRequestedCandidates;
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC)
RetainPtr<NSString> m_paragraphContextForCandidateRequest;
NSRange m_rangeForCandidates;
NSInteger m_lastCandidateRequestSequenceNumber;
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebEditorClient.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -379,7 +379,7 @@
WebThreadPostNotification(WebViewDidChangeSelectionNotification, m_webView, nil);
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC)
if (frame->editor().canEdit())
requestCandidatesForSelection(frame->selection().selection());
#endif
@@ -1194,7 +1194,7 @@
{
}
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#if PLATFORM(MAC)
void WebEditorClient::requestCandidatesForSelection(const VisibleSelection& selection)
{
@@ -1292,7 +1292,7 @@
frame->editor().handleAcceptedCandidate(acceptedCandidate);
}
-#endif // PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#endif // PLATFORM(MAC)
#if !PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm (237404 => 237405)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1064,11 +1064,7 @@
- (NSClipView *)_clipViewForPDFDocumentView
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
NSClipView *clipView = (NSClipView *)[[PDFSubview documentScrollView] contentView];
-#else
- NSClipView *clipView = (NSClipView *)[[PDFSubview documentView] _web_superviewOfClass:[NSClipView class]];
-#endif
ASSERT(clipView);
return clipView;
}
Modified: trunk/Tools/ChangeLog (237404 => 237405)
--- trunk/Tools/ChangeLog 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Tools/ChangeLog 2018-10-25 00:19:22 UTC (rev 237405)
@@ -1,3 +1,18 @@
+2018-10-24 Alexey Proskuryakov <[email protected]>
+
+ Clean up some obsolete macOS version guards
+ https://bugs.webkit.org/show_bug.cgi?id=190887
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/cocoa/TestWKWebView.mm:
+ (__simulated_forceClickAssociatedEventsMask):
+ (-[TestWKWebViewHostWindow _mouseDownAtPoint:simulatePressure:clickCount:]):
+ * WebKitTestRunner/cocoa/TestControllerCocoa.mm:
+ (WTR::initializeWebViewConfiguration):
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (-[EventSenderSyntheticEvent initPressureEventAtLocation:globalLocation:stage:pressure:stageTransition:phase:time:eventNumber:window:]):
+
2018-10-24 Megan Gardner <[email protected]>
Turn on Conic Gradients
Modified: trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm (237404 => 237405)
--- trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -103,12 +103,10 @@
#if PLATFORM(MAC)
static int gEventNumber = 1;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
NSEventMask __simulated_forceClickAssociatedEventsMask(id self, SEL _cmd)
{
return NSEventMaskPressure | NSEventMaskLeftMouseDown | NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged;
}
-#endif
- (void)_mouseDownAtPoint:(NSPoint)point simulatePressure:(BOOL)simulatePressure clickCount:(NSUInteger)clickCount
{
@@ -115,12 +113,8 @@
NSEventType mouseEventType = NSEventTypeLeftMouseDown;
NSEventMask modifierFlags = 0;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
if (simulatePressure)
modifierFlags |= NSEventMaskPressure;
-#else
- simulatePressure = NO;
-#endif
NSEvent *event = [NSEvent mouseEventWithType:mouseEventType location:point modifierFlags:modifierFlags timestamp:GetCurrentEventTime() windowNumber:self.windowNumber context:[NSGraphicsContext currentContext] eventNumber:++gEventNumber clickCount:clickCount pressure:simulatePressure];
if (!simulatePressure) {
@@ -128,7 +122,6 @@
return;
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
IMP simulatedAssociatedEventsMaskImpl = (IMP)__simulated_forceClickAssociatedEventsMask;
Method associatedEventsMaskMethod = class_getInstanceMethod([NSEvent class], @selector(associatedEventsMask));
IMP originalAssociatedEventsMaskImpl = method_setImplementation(associatedEventsMaskMethod, simulatedAssociatedEventsMaskImpl);
@@ -139,7 +132,6 @@
// to prevent subsequent event sending tests from being affected.
method_setImplementation(associatedEventsMaskMethod, originalAssociatedEventsMaskImpl);
}
-#endif
}
- (void)_mouseUpAtPoint:(NSPoint)point clickCount:(NSUInteger)clickCount
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (237404 => 237405)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -66,9 +66,7 @@
globalWebViewConfiguration._allowUniversalAccessFromFileURLs = YES;
globalWebViewConfiguration._applePayEnabled = YES;
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS_FAMILY)
WKCookieManagerSetStorageAccessAPIEnabled(WKContextGetCookieManager(context), true);
-#endif
WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)WKContextGetWebsiteDataStore((__bridge WKContextRef)globalWebViewConfiguration.processPool);
[poolWebsiteDataStore _setCacheStoragePerOriginQuota: 400 * 1024];
Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (237404 => 237405)
--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2018-10-24 23:52:53 UTC (rev 237404)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2018-10-25 00:19:22 UTC (rev 237405)
@@ -85,7 +85,7 @@
_eventSender_timestamp = time;
_eventSender_eventNumber = eventNumber;
_eventSender_window = window;
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
+#if defined(__LP64__)
self->_type = NSEventTypePressure;
_eventSender_type = NSEventTypePressure;
#endif
@@ -325,7 +325,7 @@
m_clickPosition = m_position;
}
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
+#if defined(__LP64__)
void EventSenderProxy::sendMouseDownToStartPressureEvents()
{
updateClickCountForButton(0);
@@ -573,7 +573,7 @@
void EventSenderProxy::startAndCancelMouseForceClick()
{
}
-#endif // defined(__LP64__) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101003
+#endif // defined(__LP64__)
void EventSenderProxy::mouseMoveTo(double x, double y)
{
