Title: [271057] trunk
Revision
271057
Author
[email protected]
Date
2020-12-22 10:40:15 -0800 (Tue, 22 Dec 2020)

Log Message

Unreviewed, fix the build with recent SDKs.

Source/WebCore:

* platform/cocoa/DragImageCocoa.mm:
(WebCore::createDragImageIconForCachedImageFilename):
* platform/graphics/mac/IconMac.mm:
(WebCore::Icon::createIconForFileExtension):
(WebCore::Icon::createIconForUTI):
* platform/mac/LocalDefaultSystemAppearance.mm:
(WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
(WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollerImpDelegate effectiveAppearanceForScrollerImp:]):
(WebCore::ScrollAnimatorMac::contentAreaWillPaint const):
* platform/mac/ScrollbarThemeMac.mm:
(WebCore::ScrollbarThemeMac::paintScrollCorner):
* platform/mac/ThemeMac.mm:
(WebCore::paintStepper):
(WebCore::ThemeMac::ensuredView):
(WebCore::ThemeMac::supportsLargeFormControls):
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintProgressBar):
(WebCore::createAttachmentPlaceholderImage):

Source/WebKit:

* UIProcess/PDF/WKPDFHUDView.mm:
(-[WKPDFHUDView _getImageForControlName:]):
* UIProcess/RemoteLayerTree/mac/ScrollerMac.mm:
(-[WKScrollerImpDelegate effectiveAppearanceForScrollerImp:]):

Tools:

* MiniBrowser/mac/ExtensionManagerWindowController.m:
(-[ExtensionManagerWindowController add:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
(-[WK2BrowserWindowController saveAsPDF:]):
(-[WK2BrowserWindowController saveAsWebArchive:]):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (271056 => 271057)


--- trunk/Source/WebCore/ChangeLog	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/ChangeLog	2020-12-22 18:40:15 UTC (rev 271057)
@@ -1,3 +1,28 @@
+2020-12-22  Ryan Haddad  <[email protected]>
+
+        Unreviewed, fix the build with recent SDKs.
+
+        * platform/cocoa/DragImageCocoa.mm:
+        (WebCore::createDragImageIconForCachedImageFilename):
+        * platform/graphics/mac/IconMac.mm:
+        (WebCore::Icon::createIconForFileExtension):
+        (WebCore::Icon::createIconForUTI):
+        * platform/mac/LocalDefaultSystemAppearance.mm:
+        (WebCore::LocalDefaultSystemAppearance::LocalDefaultSystemAppearance):
+        (WebCore::LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance):
+        * platform/mac/ScrollAnimatorMac.mm:
+        (-[WebScrollerImpDelegate effectiveAppearanceForScrollerImp:]):
+        (WebCore::ScrollAnimatorMac::contentAreaWillPaint const):
+        * platform/mac/ScrollbarThemeMac.mm:
+        (WebCore::ScrollbarThemeMac::paintScrollCorner):
+        * platform/mac/ThemeMac.mm:
+        (WebCore::paintStepper):
+        (WebCore::ThemeMac::ensuredView):
+        (WebCore::ThemeMac::supportsLargeFormControls):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintProgressBar):
+        (WebCore::createAttachmentPlaceholderImage):
+
 2020-12-22  Philippe Normand  <[email protected]>
 
         REGRESSION(r270612) [GStreamer][MSE] Some play/seek related failures

Modified: trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/cocoa/DragImageCocoa.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -149,7 +149,9 @@
         extension = @"";
     }
     
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     return [[NSWorkspace sharedWorkspace] iconForFileType:extension];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 
 const CGFloat linkImagePadding = 10;

Modified: trunk/Source/WebCore/platform/graphics/mac/IconMac.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/graphics/mac/IconMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/graphics/mac/IconMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -74,7 +74,9 @@
 
 RefPtr<Icon> Icon::createIconForFileExtension(const String& fileExtension)
 {
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:[@"." stringByAppendingString:fileExtension]];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     if (!image)
         return nullptr;
 
@@ -83,7 +85,9 @@
 
 RefPtr<Icon> Icon::createIconForUTI(const String& UTI)
 {
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     NSImage *image = [[NSWorkspace sharedWorkspace] iconForFileType:UTI];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     if (!image)
         return nullptr;
 

Modified: trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/mac/LocalDefaultSystemAppearance.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -34,10 +34,14 @@
 LocalDefaultSystemAppearance::LocalDefaultSystemAppearance(bool useDarkAppearance)
 {
 #if HAVE(OS_DARK_MODE_SUPPORT)
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     m_savedSystemAppearance = [NSAppearance currentAppearance];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     m_usingDarkAppearance = useDarkAppearance;
 
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [NSAppearance setCurrentAppearance:[NSAppearance appearanceNamed:m_usingDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua]];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 #else
     UNUSED_PARAM(useDarkAppearance);
 #endif
@@ -46,7 +50,9 @@
 LocalDefaultSystemAppearance::~LocalDefaultSystemAppearance()
 {
 #if HAVE(OS_DARK_MODE_SUPPORT)
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [NSAppearance setCurrentAppearance:m_savedSystemAppearance.get()];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 #endif
 }
 

Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -560,7 +560,9 @@
     UNUSED_PARAM(scrollerImp);
 
     if (!_scrollbar)
+        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
         return [NSAppearance currentAppearance];
+        ALLOW_DEPRECATED_DECLARATIONS_END
 
     // Keep this in sync with FrameView::paintScrollCorner.
     // The base system does not support dark Aqua, so we might get a null result.
@@ -567,7 +569,9 @@
     bool useDarkAppearance = _scrollbar->scrollableArea().useDarkAppearanceForScrollbars();
     if (auto *appearance = [NSAppearance appearanceNamed:useDarkAppearance ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua])
         return appearance;
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     return [NSAppearance currentAppearance];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 #endif
 
@@ -932,7 +936,9 @@
     if ([m_scrollerImpPair overlayScrollerStateIsLocked])
         return;
 
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [m_scrollerImpPair contentAreaWillDraw];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 
 void ScrollAnimatorMac::mouseEnteredContentArea()

Modified: trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -573,7 +573,9 @@
 
     auto cornerDrawingOptions = @{ (__bridge NSString *)kCUIWidgetKey: (__bridge NSString *)kCUIWidgetScrollBarTrackCorner,
         (__bridge NSString *)kCUIIsFlippedKey: (__bridge NSNumber *)kCFBooleanTrue };
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [[NSAppearance currentAppearance] _drawInRect:cornerRect context:localContext.cgContext() options:cornerDrawingOptions];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 
 #if ENABLE(RUBBER_BANDING)

Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (271056 => 271057)


--- trunk/Source/WebCore/platform/mac/ThemeMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -661,7 +661,9 @@
     }
 
     LocalCurrentGraphicsContext localContext(context);
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [[NSAppearance currentAppearance] _drawInRect:rect context:localContext.cgContext() options:@{
+    ALLOW_DEPRECATED_DECLARATIONS_END
         (__bridge NSString *)kCUIWidgetKey: (__bridge NSString *)kCUIWidgetButtonLittleArrows,
         (__bridge NSString *)kCUISizeKey: coreUISize,
         (__bridge NSString *)kCUIStateKey: coreUIState,
@@ -684,7 +686,9 @@
     // Use a fake view.
     static WebCoreThemeView *themeView = [[WebCoreThemeView alloc] init];
     [themeView setFrameSize:NSSizeFromCGSize(scrollView->totalContentsSize())];
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [themeView setAppearance:[NSAppearance currentAppearance]];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 
     themeWindowHasKeyAppearance = !(controlStates.states() & ControlStates::WindowInactiveState);
 
@@ -980,7 +984,9 @@
 
 bool ThemeMac::supportsLargeFormControls()
 {
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     static bool hasSupport = [[NSAppearance currentAppearance] _usesMetricsAppearance];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     return hasSupport;
 }
 

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (271056 => 271057)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -1397,7 +1397,9 @@
         ASSERT_NOT_REACHED();
         return nullptr;
     };
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [[NSAppearance currentAppearance] _drawInRect:NSMakeRect(0, 0, inflatedRect.width(), inflatedRect.height()) context:cgContext options:@{
+    ALLOW_DEPRECATED_DECLARATIONS_END
         (__bridge NSString *)kCUIWidgetKey: (__bridge NSString *)(isIndeterminate ? kCUIWidgetProgressIndeterminateBar : kCUIWidgetProgressBar),
         (__bridge NSString *)kCUIValueKey: @(isIndeterminate ? 1 : std::min(nextafter(1.0, -1), renderProgress.position())),
         (__bridge NSString *)kCUISizeKey: (__bridge NSString *)coreUISizeForProgressBarSize(controlSize),
@@ -2649,7 +2651,9 @@
 static std::pair<RefPtr<Image>, float> createAttachmentPlaceholderImage(float deviceScaleFactor, const AttachmentLayout& layout)
 {
 #if HAVE(ALTERNATE_ICONS)
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     auto image = [NSImage _imageWithSystemSymbolName:@"arrow.down.circle"];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     auto imageSize = FloatSize([image size]);
     auto imageSizeScales = deviceScaleFactor * layout.iconRect.size() / imageSize;
     imageSize.scale(std::min(imageSizeScales.width(), imageSizeScales.height()));

Modified: trunk/Source/WebKit/ChangeLog (271056 => 271057)


--- trunk/Source/WebKit/ChangeLog	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebKit/ChangeLog	2020-12-22 18:40:15 UTC (rev 271057)
@@ -1,3 +1,12 @@
+2020-12-22  Ryan Haddad  <[email protected]>
+
+        Unreviewed, fix the build with recent SDKs.
+
+        * UIProcess/PDF/WKPDFHUDView.mm:
+        (-[WKPDFHUDView _getImageForControlName:]):
+        * UIProcess/RemoteLayerTree/mac/ScrollerMac.mm:
+        (-[WKScrollerImpDelegate effectiveAppearanceForScrollerImp:]):
+
 2020-12-22  Youenn Fablet  <[email protected]>
 
         [iOS] Do extensive search for microphone devices when trying to capture

Modified: trunk/Source/WebKit/UIProcess/PDF/WKPDFHUDView.mm (271056 => 271057)


--- trunk/Source/WebKit/UIProcess/PDF/WKPDFHUDView.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebKit/UIProcess/PDF/WKPDFHUDView.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -332,7 +332,9 @@
     if (iconImage)
         return iconImage;
 
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     iconImage = [NSImage _imageWithSystemSymbolName:control];
+    ALLOW_DEPRECATED_DECLARATIONS_END
     if (!iconImage)
         return nil;
 

Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/mac/ScrollerMac.mm (271056 => 271057)


--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/mac/ScrollerMac.mm	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/mac/ScrollerMac.mm	2020-12-22 18:40:15 UTC (rev 271057)
@@ -201,12 +201,16 @@
     UNUSED_PARAM(scrollerImp);
 
     if (!_scroller)
+        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
         return [NSAppearance currentAppearance];
+        ALLOW_DEPRECATED_DECLARATIONS_END
 
     // The base system does not support dark Aqua, so we might get a null result.
     if (auto *appearance = [NSAppearance appearanceNamed:_scroller->pair().useDarkAppearance() ? NSAppearanceNameDarkAqua : NSAppearanceNameAqua])
         return appearance;
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     return [NSAppearance currentAppearance];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 }
 #endif
 

Modified: trunk/Tools/ChangeLog (271056 => 271057)


--- trunk/Tools/ChangeLog	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Tools/ChangeLog	2020-12-22 18:40:15 UTC (rev 271057)
@@ -1,3 +1,14 @@
+2020-12-22  Ryan Haddad  <[email protected]>
+
+        Unreviewed, fix the build with recent SDKs.
+
+        * MiniBrowser/mac/ExtensionManagerWindowController.m:
+        (-[ExtensionManagerWindowController add:]):
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:]):
+        (-[WK2BrowserWindowController saveAsPDF:]):
+        (-[WK2BrowserWindowController saveAsWebArchive:]):
+
 2020-12-22  Lauro Moura  <[email protected]>
 
         [Flapak SDK] Allow setting custom SDK repository locations and other small fixes

Modified: trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m (271056 => 271057)


--- trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Tools/MiniBrowser/mac/ExtensionManagerWindowController.m	2020-12-22 18:40:15 UTC (rev 271057)
@@ -69,7 +69,10 @@
 - (IBAction)add:(id)sender
 {
     NSOpenPanel *openPanel = [[NSOpenPanel openPanel] retain];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     openPanel.allowedFileTypes = @[ @"public.json" ];
+#pragma clang diagnostic pop
     
     [openPanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result)
     {

Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (271056 => 271057)


--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m	2020-12-22 18:28:05 UTC (rev 271056)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m	2020-12-22 18:40:15 UTC (rev 271057)
@@ -616,7 +616,10 @@
     NSOpenPanel *openPanel = [NSOpenPanel openPanel];
 
     openPanel.allowsMultipleSelection = parameters.allowsMultipleSelection;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     [openPanel setAllowedFileTypes:parameters._allowedFileExtensions];
+#pragma clang diagnostic pop
 
     [openPanel beginSheetModalForWindow:webView.window completionHandler:^(NSInteger result) {
         if (result == NSModalResponseOK)
@@ -876,7 +879,10 @@
 - (IBAction)saveAsPDF:(id)sender
 {
     NSSavePanel *panel = [NSSavePanel savePanel];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     panel.allowedFileTypes = @[ @"pdf" ];
+#pragma clang diagnostic pop
     [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
         if (result == NSModalResponseOK) {
             [_webView createPDFWithConfiguration:nil completionHandler:^(NSData *pdfSnapshotData, NSError *error) {
@@ -889,7 +895,11 @@
 - (IBAction)saveAsWebArchive:(id)sender
 {
     NSSavePanel *panel = [NSSavePanel savePanel];
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     panel.allowedFileTypes = @[ @"webarchive" ];
+#pragma clang diagnostic pop
     [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
         if (result == NSModalResponseOK) {
             [_webView createWebArchiveDataWithCompletionHandler:^(NSData *archiveData, NSError *error) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to