Title: [209339] tags/Safari-603.1.14.1/Source/WebCore
- Revision
- 209339
- Author
- [email protected]
- Date
- 2016-12-05 12:17:31 -0800 (Mon, 05 Dec 2016)
Log Message
Merge r209330. rdar://problem/29514476
Modified Paths
Diff
Modified: tags/Safari-603.1.14.1/Source/WebCore/ChangeLog (209338 => 209339)
--- tags/Safari-603.1.14.1/Source/WebCore/ChangeLog 2016-12-05 20:11:03 UTC (rev 209338)
+++ tags/Safari-603.1.14.1/Source/WebCore/ChangeLog 2016-12-05 20:17:31 UTC (rev 209339)
@@ -1,3 +1,19 @@
+2016-12-05 Matthew Hanson <[email protected]>
+
+ Merge r209330. rdar://problem/29514476
+
+ 2016-12-05 Beth Dakin <[email protected]>
+
+ 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.
+
+ Speculative fix.
+ * platform/spi/cocoa/NSTouchBarSPI.h:
+
2016-12-02 Matthew Hanson <[email protected]>
Merge r209264. rdar://problem/29487187
Modified: tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (209338 => 209339)
--- tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-05 20:11:03 UTC (rev 209338)
+++ tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h 2016-12-05 20:17:31 UTC (rev 209339)
@@ -51,9 +51,14 @@
@end
-APPKIT_EXTERN NSNotificationName const NSTouchBarWillEnterCustomization;
-APPKIT_EXTERN NSNotificationName const NSTouchBarDidExitCustomization;
+#ifndef NSTouchBarWillEnterCustomization
+#define NSTouchBarWillEnterCustomization @"NSTouchBarWillEnterCustomization"
+#endif
+#ifndef NSTouchBarWillExitCustomization
+#define NSTouchBarWillExitCustomization @"NSTouchBarWillExitCustomization"
+#endif
+
NS_ASSUME_NONNULL_END
#endif // USE(APPLE_INTERNAL_SDK)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes