Changeset 252435 in webkit
- Timestamp:
- Nov 13, 2019 3:13:24 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r252431 r252435 1 2019-11-13 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Mac] Fix build 4 https://bugs.webkit.org/show_bug.cgi?id=204136 5 6 Reviewed by Alex Christensen. 7 8 Remove deprecation warnings. 9 10 * platform/ios/ScrollViewIOS.mm: 11 (WebCore::ScrollView::platformSetCanBlitOnScroll): 12 (WebCore::ScrollView::platformCanBlitOnScroll const): 13 * platform/mac/ScrollViewMac.mm: 14 (WebCore::ScrollView::platformSetCanBlitOnScroll): 15 (WebCore::ScrollView::platformCanBlitOnScroll const): 16 * platform/mac/WidgetMac.mm: 17 (WebCore::Widget::paint): 18 * rendering/RenderThemeMac.mm: 19 (WebCore::RenderThemeMac::platformInactiveSelectionBackgroundColor const): 20 (WebCore::RenderThemeMac::platformActiveListBoxSelectionBackgroundColor const): 21 (WebCore::RenderThemeMac::platformInactiveListBoxSelectionBackgroundColor const): 22 (WebCore::RenderThemeMac::systemColor const): 23 (WebCore::paintAttachmentTitleBackground): 24 1 25 2019-11-13 Benjamin Nham <nham@apple.com> 2 26 -
trunk/Source/WebCore/platform/ios/ScrollViewIOS.mm
r237266 r252435 90 90 { 91 91 BEGIN_BLOCK_OBJC_EXCEPTIONS; 92 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 92 93 [[scrollView() contentView] setCopiesOnScroll:canBlitOnScroll]; 94 ALLOW_DEPRECATED_DECLARATIONS_END 93 95 END_BLOCK_OBJC_EXCEPTIONS; 94 96 } … … 96 98 bool ScrollView::platformCanBlitOnScroll() const 97 99 { 100 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 98 101 return [[scrollView() contentView] copiesOnScroll]; 102 ALLOW_DEPRECATED_DECLARATIONS_END 99 103 } 100 104 -
trunk/Source/WebCore/platform/mac/ScrollViewMac.mm
r235935 r252435 102 102 { 103 103 BEGIN_BLOCK_OBJC_EXCEPTIONS; 104 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 104 105 [[scrollView() contentView] setCopiesOnScroll:canBlitOnScroll]; 106 ALLOW_DEPRECATED_DECLARATIONS_END 105 107 END_BLOCK_OBJC_EXCEPTIONS; 106 108 } … … 108 110 bool ScrollView::platformCanBlitOnScroll() const 109 111 { 112 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 110 113 return [[scrollView() contentView] copiesOnScroll]; 114 ALLOW_DEPRECATED_DECLARATIONS_END 111 115 } 112 116 -
trunk/Source/WebCore/platform/mac/WidgetMac.mm
r235935 r252435 231 231 NSScrollView *scrollView = static_cast<NSScrollView *>(innerView); 232 232 // -copiesOnScroll will return NO whenever the content view is not fully opaque. 233 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 233 234 if ([scrollView drawsBackground] && ![[scrollView contentView] copiesOnScroll]) 234 235 [scrollView setDrawsBackground:NO]; 235 236 else 236 237 scrollView = 0; 238 ALLOW_DEPRECATED_DECLARATIONS_END 237 239 } 238 240 -
trunk/Source/WebCore/rendering/RenderThemeMac.mm
r252308 r252435 397 397 #else 398 398 UNUSED_PARAM(options); 399 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 399 400 return colorFromNSColor([NSColor secondarySelectedControlColor]); 401 ALLOW_DEPRECATED_DECLARATIONS_END 400 402 #endif 401 403 } … … 447 449 #else 448 450 UNUSED_PARAM(options); 451 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 449 452 return colorFromNSColor([NSColor alternateSelectedControlColor]); 453 ALLOW_DEPRECATED_DECLARATIONS_END 450 454 #endif 451 455 } … … 458 462 #else 459 463 UNUSED_PARAM(options); 464 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 460 465 return colorFromNSColor([NSColor secondarySelectedControlColor]); 466 ALLOW_DEPRECATED_DECLARATIONS_END 461 467 #endif 462 468 } … … 635 641 return systemAppearanceColor(cache.systemControlAccentColor, @selector(controlAccentColor)); 636 642 #else 643 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 637 644 return systemAppearanceColor(cache.systemControlAccentColor, @selector(alternateSelectedControlColor)); 645 ALLOW_DEPRECATED_DECLARATIONS_END 638 646 #endif 639 647 … … 727 735 return @selector(unemphasizedSelectedContentBackgroundColor); 728 736 #else 737 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 729 738 return @selector(secondarySelectedControlColor); 739 ALLOW_DEPRECATED_DECLARATIONS_END 730 740 #endif 731 741 case CSSValueAppleSystemSelectedText: … … 741 751 return @selector(unemphasizedSelectedTextBackgroundColor); 742 752 #else 753 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 743 754 return @selector(secondarySelectedControlColor); 755 ALLOW_DEPRECATED_DECLARATIONS_END 744 756 #endif 745 757 case CSSValueAppleSystemPlaceholderText: … … 2804 2816 2805 2817 Color backgroundColor; 2806 if (attachment.frame().selection().isFocusedAndActive()) 2818 if (attachment.frame().selection().isFocusedAndActive()) { 2819 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 2807 2820 backgroundColor = colorFromNSColor([NSColor alternateSelectedControlColor]); 2808 else 2821 ALLOW_DEPRECATED_DECLARATIONS_END 2822 } else 2809 2823 backgroundColor = attachmentTitleInactiveBackgroundColor(); 2810 2824 -
trunk/Source/WebKit/ChangeLog
r252434 r252435 1 2019-11-13 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Mac] Fix build 4 https://bugs.webkit.org/show_bug.cgi?id=204136 5 6 Reviewed by Alex Christensen. 7 8 Remove deprecation warnings. 9 10 * PluginProcess/mac/PluginProcessMac.mm: 11 (WebKit::replacedNSWorkspace_launchApplicationAtURL_options_configuration_error): 12 (WebKit::initializeCocoaOverrides): 13 * UIProcess/API/Cocoa/WKWebView.mm: 14 (-[WKWebView changeFont:]): 15 (-[WKWebView changeColor:]): 16 (-[WKWebView view:stringForToolTip:point:userData:]): 17 (-[WKWebView pasteboardChangedOwner:]): 18 (-[WKWebView pasteboard:provideDataForType:]): 19 * UIProcess/API/mac/WKView.mm: 20 (-[WKView changeFont:]): 21 (-[WKView view:stringForToolTip:point:userData:]): 22 (-[WKView pasteboardChangedOwner:]): 23 (-[WKView pasteboard:provideDataForType:]): 24 * UIProcess/Plugins/mac/PluginProcessProxyMac.mm: 25 (WebKit::PluginProcessProxy::launchApplicationAtURL): 26 (WebKit::PluginProcessProxy::openFile): 27 * UIProcess/mac/WebDataListSuggestionsDropdownMac.mm: 28 (-[WKDataListSuggestionView setBackgroundStyle:]): 29 * UIProcess/mac/WebPageProxyMac.mm: 30 (WebKit::WebPageProxy::savePDFToTemporaryFolderAndOpenWithNativeApplication): 31 (WebKit::WebPageProxy::openPDFFromTemporaryFolderWithNativeApplication): 32 1 33 2019-11-13 Megan Gardner <megan_gardner@apple.com> 2 34 -
trunk/Source/WebKit/PluginProcess/mac/PluginProcessMac.mm
r246514 r252435 273 273 { 274 274 Vector<String> arguments; 275 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 275 276 if (NSArray *argumentsArray = [configuration objectForKey:NSWorkspaceLaunchConfigurationArguments]) { 276 277 if ([argumentsArray isKindOfClass:[NSArray array]]) { … … 281 282 } 282 283 } 284 ALLOW_DEPRECATED_DECLARATIONS_END 283 285 284 286 if (PluginProcess::singleton().launchApplicationAtURL(URL(url).string(), arguments)) { … … 308 310 309 311 // Override -[NSWorkspace launchApplicationAtURL:options:configuration:error:] 312 // FIXME: Are these deprecation allowances necessary? 310 313 Method launchApplicationAtURLOptionsConfigurationErrorMethod = class_getInstanceMethod(objc_getClass("NSWorkspace"), @selector(launchApplicationAtURL:options:configuration:error:)); 311 314 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))); -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
r252418 r252435 3808 3808 } 3809 3809 3810 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 3810 3811 - (void)changeFont:(id)sender 3812 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 3811 3813 { 3812 3814 _impl->changeFontFromFontManager(); 3813 3815 } 3814 3816 3817 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 3815 3818 - (void)changeColor:(id)sender 3819 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 3816 3820 { 3817 3821 _impl->changeFontColorFromSender(sender); … … 4348 4352 } 4349 4353 4354 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 4350 4355 - (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data 4356 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 4351 4357 { 4352 4358 return _impl->stringForToolTip(tag); 4353 4359 } 4354 4360 4361 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 4355 4362 - (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard 4363 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 4356 4364 { 4357 4365 _impl->pasteboardChangedOwner(pasteboard); 4358 4366 } 4359 4367 4368 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 4360 4369 - (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type 4370 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 4361 4371 { 4362 4372 _impl->provideDataForPasteboard(pasteboard, type); -
trunk/Source/WebKit/UIProcess/API/mac/WKView.mm
r250973 r252435 311 311 } 312 312 313 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 313 314 - (void)changeFont:(id)sender 315 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 314 316 { 315 317 _data->_impl->changeFontFromFontManager(); … … 870 872 } 871 873 874 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 872 875 - (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data 876 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 873 877 { 874 878 return _data->_impl->stringForToolTip(tag); 875 879 } 876 880 881 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 877 882 - (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard 883 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 878 884 { 879 885 _data->_impl->pasteboardChangedOwner(pasteboard); 880 886 } 881 887 888 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 882 889 - (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type 890 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 883 891 { 884 892 _data->_impl->provideDataForPasteboard(pasteboard, type); -
trunk/Source/WebKit/UIProcess/Plugins/mac/PluginProcessProxyMac.mm
r250197 r252435 294 294 [argumentsArray addObject:(NSString *)arguments[i]]; 295 295 296 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 296 297 NSDictionary *configuration = [NSDictionary dictionaryWithObject:argumentsArray.get() forKey:NSWorkspaceLaunchConfigurationArguments]; 297 298 [[NSWorkspace sharedWorkspace] launchApplicationAtURL:[NSURL URLWithString:urlString] options:NSWorkspaceLaunchAsync configuration:configuration error:nullptr]; 299 ALLOW_DEPRECATED_DECLARATIONS_END 298 300 completionHandler(true); 299 301 } … … 345 347 return completionHandler(false); 346 348 349 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 347 350 [[NSWorkspace sharedWorkspace] openFile:fullPath]; 351 ALLOW_DEPRECATED_DECLARATIONS_END 348 352 completionHandler(true); 349 353 } -
trunk/Source/WebKit/UIProcess/mac/WebDataListSuggestionsDropdownMac.mm
r252062 r252435 200 200 { 201 201 [super setBackgroundStyle:backgroundStyle]; 202 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 202 203 self.textField.textColor = backgroundStyle == NSBackgroundStyleLight ? [NSColor textColor] : [NSColor alternateSelectedControlTextColor]; 204 ALLOW_DEPRECATED_DECLARATIONS_END 203 205 } 204 206 -
trunk/Source/WebKit/UIProcess/mac/WebPageProxyMac.mm
r251778 r252435 526 526 m_temporaryPDFFiles.add(pdfUUID, nsPath); 527 527 528 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 528 529 [[NSWorkspace sharedWorkspace] openFile:nsPath]; 530 ALLOW_DEPRECATED_DECLARATIONS_END 529 531 } 530 532 … … 536 538 return; 537 539 540 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 538 541 [[NSWorkspace sharedWorkspace] openFile:pdfFilename]; 542 ALLOW_DEPRECATED_DECLARATIONS_END 539 543 } 540 544 -
trunk/Source/WebKitLegacy/mac/ChangeLog
r252254 r252435 1 2019-11-13 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Mac] Fix build 4 https://bugs.webkit.org/show_bug.cgi?id=204136 5 6 Reviewed by Alex Christensen. 7 8 Remove deprecation warnings. 9 10 * Plugins/WebPluginController.mm: 11 (-[WebPluginController webPlugInContainerSelectionColor]): 12 * WebCoreSupport/WebFrameLoaderClient.mm: 13 (WebFrameLoaderClient::setCopiesOnScroll): 14 * WebView/WebHTMLView.mm: 15 (-[WebHTMLView view:stringForToolTip:point:userData:]): 16 (-[WebHTMLView pasteboardChangedOwner:]): 17 (-[WebHTMLView pasteboard:provideDataForType:]): 18 (-[WebHTMLView changeFont:]): 19 (-[WebHTMLView changeColor:]): 20 * WebView/WebPDFView.mm: 21 (-[WebPDFView _openWithFinder:]): 22 1 23 2019-11-08 Daniel Bates <dabates@apple.com> 2 24 -
trunk/Source/WebKitLegacy/mac/Plugins/WebPluginController.mm
r250556 r252435 539 539 if (auto* frame = core([self webFrame])) 540 540 primary = frame->selection().isFocusedAndActive(); 541 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 541 542 return primary ? [NSColor selectedTextBackgroundColor] : [NSColor secondarySelectedControlColor]; 543 ALLOW_DEPRECATED_DECLARATIONS_END 542 544 } 543 545 -
trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.mm
r251765 r252435 277 277 void WebFrameLoaderClient::setCopiesOnScroll() 278 278 { 279 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 279 280 [[[m_webFrame->_private->webFrameView _scrollView] contentView] setCopiesOnScroll:YES]; 281 ALLOW_DEPRECATED_DECLARATIONS_END 280 282 } 281 283 -
trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
r251220 r252435 1889 1889 #if PLATFORM(MAC) 1890 1890 1891 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 1891 1892 - (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data 1893 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 1892 1894 { 1893 1895 return [[_private->toolTip copy] autorelease]; … … 1995 1997 } 1996 1998 1999 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 1997 2000 - (void)pasteboardChangedOwner:(NSPasteboard *)pasteboard 2001 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 1998 2002 { 1999 2003 [self setPromisedDragTIFFDataSource:nullptr]; 2000 2004 } 2001 2005 2006 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 2002 2007 - (void)pasteboard:(NSPasteboard *)pasteboard provideDataForType:(NSString *)type 2008 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 2003 2009 { 2004 2010 if ([type isEqualToString:WebCore::legacyRTFDPasteboardType()] && [[pasteboard types] containsObject:WebArchivePboardType]) { … … 5307 5313 } 5308 5314 5315 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 5309 5316 - (void)changeFont:(id)sender 5317 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 5310 5318 { 5311 5319 COMMAND_PROLOGUE … … 5370 5378 } 5371 5379 5380 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 5372 5381 - (void)changeColor:(id)sender 5382 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 5373 5383 { 5374 5384 COMMAND_PROLOGUE -
trunk/Source/WebKitLegacy/mac/WebView/WebPDFView.mm
r250549 r252435 1275 1275 } 1276 1276 1277 ALLOW_DEPRECATED_DECLARATIONS_BEGIN 1277 1278 if (![[NSWorkspace sharedWorkspace] openFile:opath]) { 1278 1279 // NSWorkspace couldn't open file. Do we need an alert 1279 1280 // here? We ignore the error elsewhere. 1280 1281 } 1282 ALLOW_DEPRECATED_DECLARATIONS_END 1281 1283 } 1282 1284 } -
trunk/Tools/ChangeLog
r252433 r252435 1 2019-11-13 Myles C. Maxfield <mmaxfield@apple.com> 2 3 [Mac] Fix build 4 https://bugs.webkit.org/show_bug.cgi?id=204136 5 6 Reviewed by Alex Christensen. 7 8 Remove deprecation warnings. 9 10 * MiniBrowser/mac/SettingsController.m: 11 (-[SettingsController validateMenuItem:]): 12 * MiniBrowser/mac/WK1BrowserWindowController.m: 13 (-[WK1BrowserWindowController validateMenuItem:]): 14 * MiniBrowser/mac/WK2BrowserWindowController.m: 15 (-[WK2BrowserWindowController validateMenuItem:]): 16 * TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm: 17 (-[DragInfo ALLOW_DEPRECATED_IMPLEMENTATIONS_END]): 18 (-[DragInfo draggedImage]): Deleted. 19 1 20 2019-11-13 Megan Gardner <megan_gardner@apple.com> 2 21 -
trunk/Tools/MiniBrowser/mac/SettingsController.m
r249327 r252435 241 241 } 242 242 243 #pragma GCC diagnostic push 244 #pragma GCC diagnostic ignored "-Wdeprecated-implementations" 243 245 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem 246 #pragma GCC diagnostic pop 244 247 { 245 248 SEL action = [menuItem action]; -
trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m
r251956 r252435 131 131 } 132 132 133 #pragma GCC diagnostic push 134 #pragma GCC diagnostic ignored "-Wdeprecated-implementations" 133 135 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem 136 #pragma GCC diagnostic pop 134 137 { 135 138 SEL action = [menuItem action]; -
trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m
r251956 r252435 204 204 } 205 205 206 #pragma GCC diagnostic push 207 #pragma GCC diagnostic ignored "-Wdeprecated-implementations" 206 208 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem 209 #pragma GCC diagnostic pop 207 210 { 208 211 SEL action = menuItem.action; -
trunk/Tools/TestWebKitAPI/Tests/mac/LegacyDragAndDropTests.mm
r236913 r252435 33 33 #import <WebKit/WebView.h> 34 34 #import <wtf/BlockPtr.h> 35 #import <wtf/Compiler.h> 35 36 #import <wtf/RetainPtr.h> 36 37 … … 132 133 } 133 134 135 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 134 136 - (NSImage *)draggedImage 137 ALLOW_DEPRECATED_IMPLEMENTATIONS_END 135 138 { 136 139 return _image.get();
Note: See TracChangeset
for help on using the changeset viewer.