Title: [209385] trunk/Source/WebCore
- Revision
- 209385
- Author
- beid...@apple.com
- Date
- 2016-12-05 21:34:54 -0800 (Mon, 05 Dec 2016)
Log Message
Build fix followup to r209379:
STP 19 fails to launch on 16B255
https://bugs.webkit.org/show_bug.cgi?id=165388
-and corresponding-
rdar://problem/29514476
Rubberstamped by Tim Horton.
No new tests (No behavior change).
* platform/spi/cocoa/NSTouchBarSPI.h: Strategically relocate NS_ASSUME_NONNULL* macros.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (209384 => 209385)
--- trunk/Source/WebCore/ChangeLog 2016-12-06 04:46:52 UTC (rev 209384)
+++ trunk/Source/WebCore/ChangeLog 2016-12-06 05:34:54 UTC (rev 209385)
@@ -1,3 +1,18 @@
+2016-12-05 Brady Eidson <beid...@apple.com>
+
+ Build fix followup to r209379:
+
+ STP 19 fails to launch on 16B255
+ https://bugs.webkit.org/show_bug.cgi?id=165388
+ -and corresponding-
+ rdar://problem/29514476
+
+ Rubberstamped by Tim Horton.
+
+ No new tests (No behavior change).
+
+ * platform/spi/cocoa/NSTouchBarSPI.h: Strategically relocate NS_ASSUME_NONNULL* macros.
+
2016-12-05 Dave Hyatt <hy...@apple.com>
[CSS Parser] Fix dashboard region parsing
Modified: trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (209384 => 209385)
--- trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-06 04:46:52 UTC (rev 209384)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-06 05:34:54 UTC (rev 209385)
@@ -24,6 +24,9 @@
*/
#if PLATFORM(MAC) && HAVE(TOUCH_BAR)
+
+NS_ASSUME_NONNULL_BEGIN
+
#if USE(APPLE_INTERNAL_SDK)
#import <AppKit/NSFunctionBar_Private.h>
@@ -32,7 +35,6 @@
#else
-NS_ASSUME_NONNULL_BEGIN
@interface NSTouchBar ()
@property (readonly, copy, nullable) NSArray<NSTouchBarItem *> *items;
@@ -51,8 +53,6 @@
@end
-NS_ASSUME_NONNULL_END
-
#endif // USE(APPLE_INTERNAL_SDK)
APPKIT_EXTERN NSNotificationName const NSTouchBarWillEnterCustomization API_AVAILABLE(macosx(10.12.2));
@@ -60,4 +60,6 @@
APPKIT_EXTERN NSNotificationName const NSTouchBarWillExitCustomization API_AVAILABLE(macosx(10.12.2));
APPKIT_EXTERN NSNotificationName const NSTouchBarDidExitCustomization API_AVAILABLE(macosx(10.12.2));
+NS_ASSUME_NONNULL_END
+
#endif // PLATFORM(MAC) && HAVE(TOUCH_BAR)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
