Diff
Modified: trunk/Source/WebCore/ChangeLog (252434 => 252435)
--- trunk/Source/WebCore/ChangeLog 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebCore/ChangeLog 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1,3 +1,27 @@
+2019-11-13 Myles C. Maxfield <[email protected]>
+
+ [Mac] Fix build
+ https://bugs.webkit.org/show_bug.cgi?id=204136
+
+ Reviewed by Alex Christensen.
+
+ Remove deprecation warnings.
+
+ * platform/ios/ScrollViewIOS.mm:
+ (WebCore::ScrollView::platformSetCanBlitOnScroll):
+ (WebCore::ScrollView::platformCanBlitOnScroll const):
+ * platform/mac/ScrollViewMac.mm:
+ (WebCore::ScrollView::platformSetCanBlitOnScroll):
+ (WebCore::ScrollView::platformCanBlitOnScroll const):
+ * platform/mac/WidgetMac.mm:
+ (WebCore::Widget::paint):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const):
+ (WebCore::RenderThemeMac::systemColor const):
+ (WebCore::paintAttachmentTitleBackground):
+
2019-11-13 Benjamin Nham <[email protected]>
VeryHigh priority loads are actually loading at VeryLow priority
Modified: trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm (252434 => 252435)
--- trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -89,13 +89,17 @@
void ScrollView::platformSetCanBlitOnScroll(bool canBlitOnScroll)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[scrollView() contentView] setCopiesOnScroll:canBlitOnScroll];
+ ALLOW_DEPRECATED_DECLARATIONS_END
END_BLOCK_OBJC_EXCEPTIONS;
}
bool ScrollView::platformCanBlitOnScroll() const
{
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return [[scrollView() contentView] copiesOnScroll];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
IntRect ScrollView::unobscuredContentRect(VisibleContentRectIncludesScrollbars) const
Modified: trunk/Source/WebCore/platform/mac/ScrollViewMac.mm (252434 => 252435)
--- trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebCore/platform/mac/ScrollViewMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -101,13 +101,17 @@
void ScrollView::platformSetCanBlitOnScroll(bool canBlitOnScroll)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[scrollView() contentView] setCopiesOnScroll:canBlitOnScroll];
+ ALLOW_DEPRECATED_DECLARATIONS_END
END_BLOCK_OBJC_EXCEPTIONS;
}
bool ScrollView::platformCanBlitOnScroll() const
{
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return [[scrollView() contentView] copiesOnScroll];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
float ScrollView::platformTopContentInset() const
Modified: trunk/Source/WebCore/platform/mac/WidgetMac.mm (252434 => 252435)
--- trunk/Source/WebCore/platform/mac/WidgetMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebCore/platform/mac/WidgetMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -230,10 +230,12 @@
ASSERT([innerView isKindOfClass:[NSScrollView class]]);
NSScrollView *scrollView = static_cast<NSScrollView *>(innerView);
// -copiesOnScroll will return NO whenever the content view is not fully opaque.
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if ([scrollView drawsBackground] && ![[scrollView contentView] copiesOnScroll])
[scrollView setDrawsBackground:NO];
else
scrollView = 0;
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
CGContextRef cgContext = p.platformContext();
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (252434 => 252435)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -396,7 +396,9 @@
return colorFromNSColor([NSColor unemphasizedSelectedTextBackgroundColor]);
#else
UNUSED_PARAM(options);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return colorFromNSColor([NSColor secondarySelectedControlColor]);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
}
@@ -446,7 +448,9 @@
return colorFromNSColor([NSColor selectedContentBackgroundColor]);
#else
UNUSED_PARAM(options);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return colorFromNSColor([NSColor alternateSelectedControlColor]);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
}
@@ -457,7 +461,9 @@
return colorFromNSColor([NSColor unemphasizedSelectedContentBackgroundColor]);
#else
UNUSED_PARAM(options);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return colorFromNSColor([NSColor secondarySelectedControlColor]);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
}
@@ -634,7 +640,9 @@
#if HAVE(OS_DARK_MODE_SUPPORT)
return systemAppearanceColor(cache.systemControlAccentColor, @selector(controlAccentColor));
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return systemAppearanceColor(cache.systemControlAccentColor, @selector(alternateSelectedControlColor));
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
case CSSValueAppleSystemSelectedContentBackground:
@@ -726,7 +734,9 @@
#if HAVE(OS_DARK_MODE_SUPPORT)
return @selector(unemphasizedSelectedContentBackgroundColor);
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return @selector(secondarySelectedControlColor);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
case CSSValueAppleSystemSelectedText:
return @selector(selectedTextColor);
@@ -740,7 +750,9 @@
#if HAVE(OS_DARK_MODE_SUPPORT)
return @selector(unemphasizedSelectedTextBackgroundColor);
#else
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return @selector(secondarySelectedControlColor);
+ ALLOW_DEPRECATED_DECLARATIONS_END
#endif
case CSSValueAppleSystemPlaceholderText:
return @selector(placeholderTextColor);
@@ -2803,9 +2815,11 @@
backgroundRects.append(layout.lines[i].backgroundRect);
Color backgroundColor;
- if (attachment.frame().selection().isFocusedAndActive())
+ if (attachment.frame().selection().isFocusedAndActive()) {
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
backgroundColor = colorFromNSColor([NSColor alternateSelectedControlColor]);
- else
+ ALLOW_DEPRECATED_DECLARATIONS_END
+ } else
backgroundColor = attachmentTitleInactiveBackgroundColor();
backgroundColor = attachment.style().colorByApplyingColorFilter(backgroundColor);
Modified: trunk/Source/WebKit/ChangeLog (252434 => 252435)
--- trunk/Source/WebKit/ChangeLog 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/ChangeLog 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1,3 +1,35 @@
+2019-11-13 Myles C. Maxfield <[email protected]>
+
+ [Mac] Fix build
+ https://bugs.webkit.org/show_bug.cgi?id=204136
+
+ Reviewed by Alex Christensen.
+
+ Remove deprecation warnings.
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::replacedNSWorkspace_launchApplicationAtURL_options_configuration_error):
+ (WebKit::initializeCocoaOverrides):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView changeFont:]):
+ (-[WKWebView changeColor:]):
+ (-[WKWebView view:stringForToolTip:point:userData:]):
+ (-[WKWebView pasteboardChangedOwner:]):
+ (-[WKWebView pasteboard:provideDataForType:]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView changeFont:]):
+ (-[WKView view:stringForToolTip:point:userData:]):
+ (-[WKView pasteboardChangedOwner:]):
+ (-[WKView pasteboard:provideDataForType:]):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::launchApplicationAtURL):
+ (WebKit::PluginProcessProxy::openFile):
+ * UIProcess/mac/WebDataListSuggestionsDropdownMac.mm:
+ (-[WKDataListSuggestionView setBackgroundStyle:]):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication):
+ (WebKit::WebPageProxy::openPDFFromTemporaryFolderWithNativeApplication):
+
2019-11-13 Megan Gardner <[email protected]>
Cleanup old UIKit Staging
Modified: trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm (252434 => 252435)
--- trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -272,6 +272,7 @@
static NSRunningApplication *replacedNSWorkspace_launchApplicationAtURL_options_configuration_error(NSWorkspace *self, SEL _cmd, NSURL *url, NSWorkspaceLaunchOptions options, NSDictionary *configuration, NSError **error)
{
Vector<String> arguments;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (NSArray *argumentsArray = [configuration objectForKey:NSWorkspaceLaunchConfigurationArguments]) {
if ([argumentsArray isKindOfClass:[NSArray array]]) {
for (NSString *argument in argumentsArray) {
@@ -280,6 +281,7 @@
}
}
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
if (PluginProcess::singleton().launchApplicationAtURL(URL(url).string(), arguments)) {
if (error)
@@ -307,6 +309,7 @@
NSConcreteTask_launch = reinterpret_cast<void (*)(NSTask *, SEL)>(method_setImplementation(launchMethod, reinterpret_cast<IMP>(replacedNSConcreteTask_launch)));
// Override -[NSWorkspace launchApplicationAtURL:options:configuration:error:]
+ // FIXME: Are these deprecation allowances necessary?
Method launchApplicationAtURLOptionsConfigurationErrorMethod = class_getInstanceMethod(objc_getClass("NSWorkspace"), @selector(launchApplicationAtURL:options:configuration:error:));
NSWorkspace_launchApplicationAtURL_options_configuration_error = reinterpret_cast<NSRunningApplication *(*)(NSWorkspace *, SEL, NSURL *, NSWorkspaceLaunchOptions, NSDictionary *, NSError **)>(method_setImplementation(launchApplicationAtURLOptionsConfigurationErrorMethod, reinterpret_cast<IMP>(replacedNSWorkspace_launchApplicationAtURL_options_configuration_error)));
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (252434 => 252435)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -3807,12 +3807,16 @@
return _impl->readSelectionFromPasteboard(pasteboard);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)changeFont:(id)sender
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_impl->changeFontFromFontManager();
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)changeColor:(id)sender
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
{
_impl->changeFontColorFromSender(sender);
}
@@ -4347,17 +4351,23 @@
_impl->removeTrackingRects(tags, count);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
return _impl->stringForToolTip(tag);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_impl->pasteboardChangedOwner(pasteboard);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_impl->provideDataForPasteboard(pasteboard, type);
}
Modified: trunk/Source/WebKit/UIProcess/API/mac/WKView.mm (252434 => 252435)
--- trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/UIProcess/API/mac/WKView.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -310,7 +310,9 @@
return _data->_impl->readSelectionFromPasteboard(pasteboard);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)changeFont:(id)sender
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_data->_impl->changeFontFromFontManager();
}
@@ -869,17 +871,23 @@
_data->_impl->removeTrackingRects(tags, count);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
return _data->_impl->stringForToolTip(tag);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_data->_impl->pasteboardChangedOwner(pasteboard);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
_data->_impl->provideDataForPasteboard(pasteboard, type);
}
Modified: trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (252434 => 252435)
--- trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -293,8 +293,10 @@
for (size_t i = 0; i < arguments.size(); ++i)
[argumentsArray addObject:(NSString *)arguments[i]];
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
NSDictionary *configuration = [NSDictionary dictionaryWithObject:argumentsArray.get() forKey:NSWorkspaceLaunchConfigurationArguments];
[[NSWorkspace sharedWorkspace] launchApplicationAtURL:[NSURL URLWithString:urlString] options:NSWorkspaceLaunchAsync configuration:configuration error:nullptr];
+ ALLOW_DEPRECATED_DECLARATIONS_END
completionHandler(true);
}
@@ -344,7 +346,9 @@
if (!shouldOpenFile(m_pluginProcessAttributes, fullPath))
return completionHandler(false);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[NSWorkspace sharedWorkspace] openFile:fullPath];
+ ALLOW_DEPRECATED_DECLARATIONS_END
completionHandler(true);
}
Modified: trunk/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm (252434 => 252435)
--- trunk/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -199,7 +199,9 @@
- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle
{
[super setBackgroundStyle:backgroundStyle];
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
self.textField.textColor = backgroundStyle == NSBackgroundStyleLight ? [NSColor textColor] : [NSColor alternateSelectedControlTextColor];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
- (BOOL)acceptsFirstResponder
Modified: trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm (252434 => 252435)
--- trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -525,7 +525,9 @@
m_temporaryPDFFiles.add(pdfUUID, nsPath);
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[NSWorkspace sharedWorkspace] openFile:nsPath];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
void WebPageProxy::openPDFFromTemporaryFolderWithNativeApplication(const String& pdfUUID)
@@ -535,7 +537,9 @@
if (!pdfFilename.endsWithIgnoringASCIICase(".pdf"))
return;
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[NSWorkspace sharedWorkspace] openFile:pdfFilename];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
#if ENABLE(PDFKIT_PLUGIN)
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (252434 => 252435)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1,3 +1,25 @@
+2019-11-13 Myles C. Maxfield <[email protected]>
+
+ [Mac] Fix build
+ https://bugs.webkit.org/show_bug.cgi?id=204136
+
+ Reviewed by Alex Christensen.
+
+ Remove deprecation warnings.
+
+ * Plugins/WebPluginController.mm:
+ (-[WebPluginController webPlugInContainerSelectionColor]):
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::setCopiesOnScroll):
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView view:stringForToolTip:point:userData:]):
+ (-[WebHTMLView pasteboardChangedOwner:]):
+ (-[WebHTMLView pasteboard:provideDataForType:]):
+ (-[WebHTMLView changeFont:]):
+ (-[WebHTMLView changeColor:]):
+ * WebView/WebPDFView.mm:
+ (-[WebPDFView _openWithFinder:]):
+
2019-11-08 Daniel Bates <[email protected]>
Add WebKit Legacy SPI to retrieve editable elements in rect
Modified: trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm (252434 => 252435)
--- trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -538,7 +538,9 @@
bool primary = true;
if (auto* frame = core([self webFrame]))
primary = frame->selection().isFocusedAndActive();
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
return primary ? [NSColor selectedTextBackgroundColor] : [NSColor secondarySelectedControlColor];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
// For compatibility only.
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm (252434 => 252435)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -276,7 +276,9 @@
void WebFrameLoaderClient::setCopiesOnScroll()
{
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
[[[m_webFrame->_private->webFrameView _scrollView] contentView] setCopiesOnScroll:YES];
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
void WebFrameLoaderClient::detachedFromParent2()
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (252434 => 252435)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1888,7 +1888,9 @@
#if PLATFORM(MAC)
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
return [[_private->toolTip copy] autorelease];
}
@@ -1994,12 +1996,16 @@
return [NSArray arrayWithObjects:WebArchivePboardType, WebCore::legacyRTFDPasteboardType(), WebCore::legacyRTFPasteboardType(), WebCore::legacyStringPasteboardType(), nil];
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
[self setPromisedDragTIFFDataSource:nullptr];
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
if ([type isEqualToString:WebCore::legacyRTFDPasteboardType()] && [[pasteboard types] containsObject:WebArchivePboardType]) {
auto archive = adoptNS([[WebArchive alloc] initWithData:[pasteboard dataForType:WebArchivePboardType]]);
@@ -5306,7 +5312,9 @@
[self _pasteWithPasteboard:[NSPasteboard generalPasteboard] allowPlainText:NO];
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)changeFont:(id)sender
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
COMMAND_PROLOGUE
@@ -5369,7 +5377,9 @@
[self _changeCSSColorUsingSelector:@selector(setBackgroundColor:) inRange:[self _documentRange]];
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (void)changeColor:(id)sender
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
COMMAND_PROLOGUE
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm (252434 => 252435)
--- trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1274,10 +1274,12 @@
written = YES;
}
+ ALLOW_DEPRECATED_DECLARATIONS_BEGIN
if (![[NSWorkspace sharedWorkspace] openFile:opath]) {
// NSWorkspace couldn't open file. Do we need an alert
// here? We ignore the error elsewhere.
}
+ ALLOW_DEPRECATED_DECLARATIONS_END
}
}
Modified: trunk/Tools/ChangeLog (252434 => 252435)
--- trunk/Tools/ChangeLog 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Tools/ChangeLog 2019-11-13 23:13:24 UTC (rev 252435)
@@ -1,3 +1,22 @@
+2019-11-13 Myles C. Maxfield <[email protected]>
+
+ [Mac] Fix build
+ https://bugs.webkit.org/show_bug.cgi?id=204136
+
+ Reviewed by Alex Christensen.
+
+ Remove deprecation warnings.
+
+ * MiniBrowser/mac/SettingsController.m:
+ (-[SettingsController validateMenuItem:]):
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ * TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm:
+ (-[DragInfo ALLOW_DEPRECATED_IMPLEMENTATIONS_END]):
+ (-[DragInfo draggedImage]): Deleted.
+
2019-11-13 Megan Gardner <[email protected]>
check-webkit-style: fix false errors for obj-c method calls in range-based for statements using colon syntax
Modified: trunk/Tools/MiniBrowser/mac/SettingsController.m (252434 => 252435)
--- trunk/Tools/MiniBrowser/mac/SettingsController.m 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Tools/MiniBrowser/mac/SettingsController.m 2019-11-13 23:13:24 UTC (rev 252435)
@@ -240,7 +240,10 @@
[self _addItemWithTitle:@"Enable Subpixel CSSOM Metrics" action:@selector(toggleEnableSubPixelCSSOMMetrics:) indented:YES];
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+#pragma GCC diagnostic pop
{
SEL action = "" action];
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (252434 => 252435)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2019-11-13 23:13:24 UTC (rev 252435)
@@ -130,7 +130,10 @@
return (fabs(a - b) <= tolerance);
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+#pragma GCC diagnostic pop
{
SEL action = "" action];
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (252434 => 252435)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2019-11-13 23:13:24 UTC (rev 252435)
@@ -203,7 +203,10 @@
return (fabs(a - b) <= tolerance);
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-implementations"
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+#pragma GCC diagnostic pop
{
SEL action = ""
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm (252434 => 252435)
--- trunk/Tools/TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm 2019-11-13 23:05:00 UTC (rev 252434)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm 2019-11-13 23:13:24 UTC (rev 252435)
@@ -32,6 +32,7 @@
#import <AppKit/NSDragging.h>
#import <WebKit/WebView.h>
#import <wtf/BlockPtr.h>
+#import <wtf/Compiler.h>
#import <wtf/RetainPtr.h>
@interface FrameLoadCompletionListener : NSObject<WebFrameLoadDelegate> {
@@ -131,7 +132,9 @@
return NSMakePoint(_lastMousePosition.x + _offset.width, _lastMousePosition.y + _offset.height);
}
+ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
- (NSImage *)draggedImage
+ALLOW_DEPRECATED_IMPLEMENTATIONS_END
{
return _image.get();
}
