[webkit-changes] [231711] branches/safari-606.1.17-branch/Source

Fri, 11 May 2018 12:00:05 -0700

Title: [231711] branches/safari-606.1.17-branch/Source
Revision
231711
Author
[email protected]
Date
2018-05-11 11:59:33 -0700 (Fri, 11 May 2018)

Log Message

Cherry-pick r231651. rdar://problem/40131741

    Fix the build after r231393
    https://bugs.webkit.org/show_bug.cgi?id=185519
    <rdar://problem/40131741>

    Reviewed by Simon Fraser.

    Source/WebCore:

    * Configurations/WebCore.xcconfig:

    Source/WTF:

    * wtf/Platform.h:

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

Modified Paths

Diff

Modified: branches/safari-606.1.17-branch/Source/WTF/ChangeLog (231710 => 231711)


--- branches/safari-606.1.17-branch/Source/WTF/ChangeLog	2018-05-11 18:39:06 UTC (rev 231710)
+++ branches/safari-606.1.17-branch/Source/WTF/ChangeLog	2018-05-11 18:59:33 UTC (rev 231711)
@@ -1,3 +1,34 @@
+2018-05-11  Jason Marcell  <[email protected]>
+
+        Cherry-pick r231651. rdar://problem/40131741
+
+    Fix the build after r231393
+    https://bugs.webkit.org/show_bug.cgi?id=185519
+    <rdar://problem/40131741>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    * Configurations/WebCore.xcconfig:
+    
+    Source/WTF:
+    
+    * wtf/Platform.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-05-10  Tim Horton  <[email protected]>
+
+            Fix the build after r231393
+            https://bugs.webkit.org/show_bug.cgi?id=185519
+            <rdar://problem/40131741>
+
+            Reviewed by Simon Fraser.
+
+            * wtf/Platform.h:
+
 2018-05-06  Yusuke Suzuki  <[email protected]>
 
         [JSC][GTK][JSCONLY] Use capstone disassembler

Modified: branches/safari-606.1.17-branch/Source/WTF/wtf/Platform.h (231710 => 231711)


--- branches/safari-606.1.17-branch/Source/WTF/wtf/Platform.h	2018-05-11 18:39:06 UTC (rev 231710)
+++ branches/safari-606.1.17-branch/Source/WTF/wtf/Platform.h	2018-05-11 18:59:33 UTC (rev 231711)
@@ -1315,7 +1315,7 @@
 #define HAVE_RSA_PSS 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000 && !PLATFORM(APPLETV))
 #define HAVE_URL_FORMATTING 1
 #endif

Modified: branches/safari-606.1.17-branch/Source/WebCore/ChangeLog (231710 => 231711)


--- branches/safari-606.1.17-branch/Source/WebCore/ChangeLog	2018-05-11 18:39:06 UTC (rev 231710)
+++ branches/safari-606.1.17-branch/Source/WebCore/ChangeLog	2018-05-11 18:59:33 UTC (rev 231711)
@@ -1,3 +1,34 @@
+2018-05-11  Jason Marcell  <[email protected]>
+
+        Cherry-pick r231651. rdar://problem/40131741
+
+    Fix the build after r231393
+    https://bugs.webkit.org/show_bug.cgi?id=185519
+    <rdar://problem/40131741>
+    
+    Reviewed by Simon Fraser.
+    
+    Source/WebCore:
+    
+    * Configurations/WebCore.xcconfig:
+    
+    Source/WTF:
+    
+    * wtf/Platform.h:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-05-10  Tim Horton  <[email protected]>
+
+            Fix the build after r231393
+            https://bugs.webkit.org/show_bug.cgi?id=185519
+            <rdar://problem/40131741>
+
+            Reviewed by Simon Fraser.
+
+            * Configurations/WebCore.xcconfig:
+
 2018-05-10  Jason Marcell  <[email protected]>
 
         Cherry-pick r231622. rdar://problem/39664620

Modified: branches/safari-606.1.17-branch/Source/WebCore/Configurations/WebCore.xcconfig (231710 => 231711)


--- branches/safari-606.1.17-branch/Source/WebCore/Configurations/WebCore.xcconfig	2018-05-11 18:39:06 UTC (rev 231710)
+++ branches/safari-606.1.17-branch/Source/WebCore/Configurations/WebCore.xcconfig	2018-05-11 18:59:33 UTC (rev 231711)
@@ -187,8 +187,14 @@
 WK_HAVE_DEVICE_IDENTITY = $(WK_HAVE_DEVICE_IDENTITY_$(PLATFORM_NAME));
 WK_HAVE_DEVICE_IDENTITY_iphoneos = YES;
 
-WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_YES = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_COCOA_TOUCH_NO = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
+WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
+WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphoneminimalsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_appletvos = NO
+WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
+WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
 WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
 WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to