Title: [209395] trunk/Source/WebCore
Revision
209395
Author
[email protected]
Date
2016-12-06 08:50:12 -0800 (Tue, 06 Dec 2016)

Log Message

Tried to fix the USE(APPLE_INTERNAL_SDK) build after r209385.

* platform/spi/cocoa/NSTouchBarSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209394 => 209395)


--- trunk/Source/WebCore/ChangeLog	2016-12-06 16:40:56 UTC (rev 209394)
+++ trunk/Source/WebCore/ChangeLog	2016-12-06 16:50:12 UTC (rev 209395)
@@ -1,3 +1,9 @@
+2016-12-06  Dan Bernstein  <[email protected]>
+
+        Tried to fix the USE(APPLE_INTERNAL_SDK) build after r209385.
+
+        * platform/spi/cocoa/NSTouchBarSPI.h:
+
 2016-12-05  Jer Noble  <[email protected]>
 
         [pointer-lock] Cursor should become visible when exiting pointer-lock via ESC key.

Modified: trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (209394 => 209395)


--- trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-12-06 16:40:56 UTC (rev 209394)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-12-06 16:50:12 UTC (rev 209395)
@@ -25,8 +25,6 @@
 
 #if PLATFORM(MAC) && HAVE(TOUCH_BAR)
 
-NS_ASSUME_NONNULL_BEGIN
-
 #if USE(APPLE_INTERNAL_SDK)
 
 #import <AppKit/NSFunctionBar_Private.h>
@@ -33,9 +31,12 @@
 #import <AppKit/NSTextTouchBarItemController_WebKitSPI.h>
 #import <AppKit/NSTouchBar_Private.h>
 
-#else
+#endif
 
+NS_ASSUME_NONNULL_BEGIN
 
+#if !USE(APPLE_INTERNAL_SDK)
+
 @interface NSTouchBar ()
 @property (readonly, copy, nullable) NSArray<NSTouchBarItem *> *items;
 @property (strong, nullable) NSTouchBarItem *escapeKeyReplacementItem;
@@ -53,7 +54,7 @@
 
 @end
 
-#endif // USE(APPLE_INTERNAL_SDK)
+#endif // !USE(APPLE_INTERNAL_SDK)
 
 APPKIT_EXTERN NSNotificationName const NSTouchBarWillEnterCustomization API_AVAILABLE(macosx(10.12.2));
 APPKIT_EXTERN NSNotificationName const NSTouchBarDidEnterCustomization API_AVAILABLE(macosx(10.12.2));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to