Title: [239302] tags/Safari-607.1.16.5/Source/WebKit
Revision
239302
Author
alanc...@apple.com
Date
2018-12-17 15:58:35 -0800 (Mon, 17 Dec 2018)

Log Message

Cherry-pick r239294. rdar://problem/46757541

    Unreviewed, revert recent CrashReporterClient build fixes as they are no longer needed.

    * Platform/cocoa/WKCrashReporter.mm:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: tags/Safari-607.1.16.5/Source/WebKit/ChangeLog (239301 => 239302)


--- tags/Safari-607.1.16.5/Source/WebKit/ChangeLog	2018-12-17 23:58:32 UTC (rev 239301)
+++ tags/Safari-607.1.16.5/Source/WebKit/ChangeLog	2018-12-17 23:58:35 UTC (rev 239302)
@@ -1,5 +1,21 @@
 2018-12-17  Alan Coon  <alanc...@apple.com>
 
+        Cherry-pick r239294. rdar://problem/46757541
+
+    Unreviewed, revert recent CrashReporterClient build fixes as they are no longer needed.
+    
+    * Platform/cocoa/WKCrashReporter.mm:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@239294 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-12-17  Chris Dumez  <cdu...@apple.com>
+
+            Unreviewed, revert recent CrashReporterClient build fixes as they are no longer needed.
+
+            * Platform/cocoa/WKCrashReporter.mm:
+
+2018-12-17  Alan Coon  <alanc...@apple.com>
+
         Cherry-pick r239059. rdar://problem/46382007
 
     Animated scrolling on Google Maps scrolls the page in addition to moving the map

Modified: tags/Safari-607.1.16.5/Source/WebKit/Platform/cocoa/WKCrashReporter.mm (239301 => 239302)


--- tags/Safari-607.1.16.5/Source/WebKit/Platform/cocoa/WKCrashReporter.mm	2018-12-17 23:58:32 UTC (rev 239301)
+++ tags/Safari-607.1.16.5/Source/WebKit/Platform/cocoa/WKCrashReporter.mm	2018-12-17 23:58:35 UTC (rev 239302)
@@ -30,17 +30,10 @@
 #import "CrashReporterClientSPI.h"
 
 // Avoid having to link with libCrashReporterClient.a
-#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
 CRASH_REPORTER_CLIENT_HIDDEN
 struct crashreporter_annotations_t gCRAnnotations
 __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
-    = { {CRASHREPORTER_ANNOTATIONS_VERSION}, {0}, {0}, {0}, {0}, {0}, {0}, {0} };
-#else
-CRASH_REPORTER_CLIENT_HIDDEN
-struct crashreporter_annotations_t gCRAnnotations
-__attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION)))
     = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0 };
-#endif
 
 namespace WebKit {
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to