Title: [221739] tags/Safari-605.1.5/Source/WebCore/PAL
- Revision
- 221739
- Author
- [email protected]
- Date
- 2017-09-07 10:20:42 -0700 (Thu, 07 Sep 2017)
Log Message
Cherry-pick r221738. rdar://problem/34296289
Modified Paths
Diff
Modified: tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog (221738 => 221739)
--- tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog 2017-09-07 17:03:49 UTC (rev 221738)
+++ tags/Safari-605.1.5/Source/WebCore/PAL/ChangeLog 2017-09-07 17:20:42 UTC (rev 221739)
@@ -1,3 +1,20 @@
+2017-09-07 Matthew Hanson <[email protected]>
+
+ Cherry-pick r221738. rdar://problem/34296289
+
+ 2017-09-07 Wenson Hsieh <[email protected]>
+
+ [Mac] Stop importing NSFunctionBar_Private.h in NSTouchBarSPI.h on the macOS 10.13+ SDK
+ https://bugs.webkit.org/show_bug.cgi?id=176521
+ <rdar://problem/34296289>
+
+ Reviewed by Andy Estes.
+
+ We don't need to import NSFunctionBar_Private.h when building against the macOS 10.13 SDK, or later. Guard this
+ header import with an SDK version check.
+
+ * pal/spi/cocoa/NSTouchBarSPI.h:
+
2017-09-04 Commit Queue <[email protected]>
Unreviewed, rolling out r221494 and r221500.
Modified: tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h (221738 => 221739)
--- tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h 2017-09-07 17:03:49 UTC (rev 221738)
+++ tags/Safari-605.1.5/Source/WebCore/PAL/pal/spi/cocoa/NSTouchBarSPI.h 2017-09-07 17:20:42 UTC (rev 221739)
@@ -28,12 +28,15 @@
#if USE(APPLE_INTERNAL_SDK)
#import <AppKit/NSCandidateListTouchBarItem_Private.h>
-#import <AppKit/NSFunctionBar_Private.h>
#import <AppKit/NSTextTouchBarItemController_WebKitSPI.h>
#import <AppKit/NSTouchBar_Private.h>
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 101300
+#import <AppKit/NSFunctionBar_Private.h>
#endif
+#endif
+
NS_ASSUME_NONNULL_BEGIN
#if !USE(APPLE_INTERNAL_SDK)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
