Title: [209382] tags/Safari-603.1.14.2/Source/WebCore
- Revision
- 209382
- Author
- bshaf...@apple.com
- Date
- 2016-12-05 19:37:29 -0800 (Mon, 05 Dec 2016)
Log Message
Merged r209379. rdar://problem/29514476
Modified Paths
Diff
Modified: tags/Safari-603.1.14.2/Source/WebCore/ChangeLog (209381 => 209382)
--- tags/Safari-603.1.14.2/Source/WebCore/ChangeLog 2016-12-06 03:35:52 UTC (rev 209381)
+++ tags/Safari-603.1.14.2/Source/WebCore/ChangeLog 2016-12-06 03:37:29 UTC (rev 209382)
@@ -1,3 +1,20 @@
+2016-12-05 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r209379.
+
+ 2016-12-05 Ricky Mondello <rmonde...@apple.com>
+
+ STP 19 fails to launch on 16B255
+ https://bugs.webkit.org/show_bug.cgi?id=165388
+ -and corresponding-
+ rdar://problem/29514476
+
+ Reviewed by Tim Horton.
+
+ * platform/spi/cocoa/NSTouchBarSPI.h: Re-declare the SPI symbols as weak. The cited crash itself is for a
+ symbol we weren't handling here, but is part of the same group. Re-declare all four of these symbols to
+ be safe.
+
2016-12-05 Matthew Hanson <matthew_han...@apple.com>
Merge r209332. rdar://problem/29514476
Modified: tags/Safari-603.1.14.2/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (209381 => 209382)
--- tags/Safari-603.1.14.2/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-06 03:35:52 UTC (rev 209381)
+++ tags/Safari-603.1.14.2/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-06 03:37:29 UTC (rev 209382)
@@ -51,10 +51,13 @@
@end
-#define NSTouchBarWillEnterCustomization @"NSTouchBarWillEnterCustomization"
-#define NSTouchBarWillExitCustomization @"NSTouchBarWillExitCustomization"
-
NS_ASSUME_NONNULL_END
#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));
+APPKIT_EXTERN NSNotificationName const NSTouchBarWillExitCustomization API_AVAILABLE(macosx(10.12.2));
+APPKIT_EXTERN NSNotificationName const NSTouchBarDidExitCustomization API_AVAILABLE(macosx(10.12.2));
+
#endif // PLATFORM(MAC) && HAVE(TOUCH_BAR)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
