Title: [202971] trunk/Source
Revision
202971
Author
[email protected]
Date
2016-07-08 00:17:17 -0700 (Fri, 08 Jul 2016)

Log Message

Define DYLD_MACOSX_VERSION_10_12
https://bugs.webkit.org/show_bug.cgi?id=159525
<rdar://problem/26250296>

Reviewed by Brent Fulgham.

Source/WebKit/mac:

* WebView/WebView.mm:
(shouldConvertInvalidURLsToBlank):
Replace 0x000A0C00 with DYLD_MACOSX_VERSION_10_12.

Source/WTF:

* wtf/spi/darwin/dyldSPI.h:

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (202970 => 202971)


--- trunk/Source/WTF/ChangeLog	2016-07-08 07:15:24 UTC (rev 202970)
+++ trunk/Source/WTF/ChangeLog	2016-07-08 07:17:17 UTC (rev 202971)
@@ -1,3 +1,13 @@
+2016-07-08  Jiewen Tan  <[email protected]>
+
+        Define DYLD_MACOSX_VERSION_10_12
+        https://bugs.webkit.org/show_bug.cgi?id=159525
+        <rdar://problem/26250296>
+
+        Reviewed by Brent Fulgham.
+
+        * wtf/spi/darwin/dyldSPI.h:
+
 2016-07-01  Jer Noble  <[email protected]>
 
         REGRESSION (r202641): Netflix playback stalls after a few seconds

Modified: trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h (202970 => 202971)


--- trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h	2016-07-08 07:15:24 UTC (rev 202970)
+++ trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h	2016-07-08 07:17:17 UTC (rev 202971)
@@ -33,6 +33,10 @@
 #define DYLD_IOS_VERSION_10_0 0x000A0000
 #endif
 
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
+#define DYLD_MACOSX_VERSION_10_12 0x000A0C00
+#endif
+
 #else
 
 #define DYLD_IOS_VERSION_3_0 0x00030000
@@ -43,6 +47,8 @@
 #define DYLD_IOS_VERSION_9_0 0x00090000
 #define DYLD_IOS_VERSION_10_0 0x000A0000
 
+#define DYLD_MACOSX_VERSION_10_12 0x000A0C00
+
 #endif
 
 extern "C" uint32_t dyld_get_program_sdk_version();

Modified: trunk/Source/WebKit/mac/ChangeLog (202970 => 202971)


--- trunk/Source/WebKit/mac/ChangeLog	2016-07-08 07:15:24 UTC (rev 202970)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-07-08 07:17:17 UTC (rev 202971)
@@ -1,3 +1,15 @@
+2016-07-08  Jiewen Tan  <[email protected]>
+
+        Define DYLD_MACOSX_VERSION_10_12
+        https://bugs.webkit.org/show_bug.cgi?id=159525
+        <rdar://problem/26250296>
+
+        Reviewed by Brent Fulgham.
+
+        * WebView/WebView.mm:
+        (shouldConvertInvalidURLsToBlank):
+        Replace 0x000A0C00 with DYLD_MACOSX_VERSION_10_12.
+
 2016-07-07  Beth Dakin  <[email protected]>
 
         API Test DoNotLeakWebView.ViewThatLoadsEditableArea times out on macOS Sierra

Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202970 => 202971)


--- trunk/Source/WebKit/mac/WebView/WebView.mm	2016-07-08 07:15:24 UTC (rev 202970)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2016-07-08 07:17:17 UTC (rev 202971)
@@ -891,7 +891,7 @@
 #if PLATFORM(IOS)
     static bool shouldConvertInvalidURLsToBlank = dyld_get_program_sdk_version() >= DYLD_IOS_VERSION_10_0;
 #elif PLATFORM(MAC)
-    static bool shouldConvertInvalidURLsToBlank = dyld_get_program_sdk_version() >= 0x000A0C00;
+    static bool shouldConvertInvalidURLsToBlank = dyld_get_program_sdk_version() >= DYLD_MACOSX_VERSION_10_12;
 #else
     static bool shouldConvertInvalidURLsToBlank = true;
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to