Title: [209340] tags/Safari-603.1.14.1/Source/WebCore
Revision
209340
Author
[email protected]
Date
2016-12-05 12:17:35 -0800 (Mon, 05 Dec 2016)

Log Message

Merge r209332. rdar://problem/29514476

Modified Paths

Diff

Modified: tags/Safari-603.1.14.1/Source/WebCore/ChangeLog (209339 => 209340)


--- tags/Safari-603.1.14.1/Source/WebCore/ChangeLog	2016-12-05 20:17:31 UTC (rev 209339)
+++ tags/Safari-603.1.14.1/Source/WebCore/ChangeLog	2016-12-05 20:17:35 UTC (rev 209340)
@@ -1,5 +1,20 @@
 2016-12-05  Matthew Hanson  <[email protected]>
 
+        Merge r209332. 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
+
+            Rubber-stamped by Brady Eidson.
+
+            * platform/spi/cocoa/NSTouchBarSPI.h:
+
+2016-12-05  Matthew Hanson  <[email protected]>
+
         Merge r209330. rdar://problem/29514476
 
     2016-12-05  Beth Dakin  <[email protected]>

Modified: tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h (209339 => 209340)


--- tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-12-05 20:17:31 UTC (rev 209339)
+++ tags/Safari-603.1.14.1/Source/WebCore/platform/spi/cocoa/NSTouchBarSPI.h	2016-12-05 20:17:35 UTC (rev 209340)
@@ -51,13 +51,8 @@
 
 @end
 
-#ifndef NSTouchBarWillEnterCustomization
 #define NSTouchBarWillEnterCustomization @"NSTouchBarWillEnterCustomization"
-#endif
-
-#ifndef NSTouchBarWillExitCustomization
 #define NSTouchBarWillExitCustomization @"NSTouchBarWillExitCustomization"
-#endif
 
 NS_ASSUME_NONNULL_END
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to