Changeset 200139 in webkit

Timestamp:

Apr 27, 2016 12:00:22 PM (8 years ago)

Author:

mark.lam@apple.com

Message:

Address feedback from ​https://bugs.webkit.org/show_bug.cgi?id=157048#c5.
​https://bugs.webkit.org/show_bug.cgi?id=157096

Reviewed by Geoffrey Garen.

1. Check for USE(APPLE_INTERNAL_SDK) instead of has_include(<mach-o/dyld_priv.h>).
2. Rename webkitFirstSDKVersionWithInitConstructorSupport to firstSDKVersionWithInitConstructorSupport.

• API/JSWrapperMap.mm:

(supportsInitMethodConstructors):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSWrapperMap.mm (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSWrapperMap.mm

@@ -45 +45 @@
 #include <mach-o/dyld.h>
 
-#if __has_include(<mach-o/dyld_priv.h>)
+#if USE(APPLE_INTERNAL_SDK)
 #include <mach-o/dyld_priv.h>
 #endif
@@ -52 +52 @@
 #if PLATFORM(APPLETV)
 #elif PLATFORM(IOS)
-static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0x80000; // iOS 8.0.0
+static const uint32_t firstSDKVersionWithInitConstructorSupport = 0x80000; // iOS 8.0.0
 #elif PLATFORM(MAC)
-static const uint32_t webkitFirstSDKVersionWithInitConstructorSupport = 0xA0A00; // OSX 10.10.0
+static const uint32_t firstSDKVersionWithInitConstructorSupport = 0xA0A00; // OSX 10.10.0
 #endif
 
@@ -665 +665 @@
     if (!programSDKVersion)
         programSDKVersion = dyld_get_program_sdk_version();
-    return programSDKVersion >= webkitFirstSDKVersionWithInitConstructorSupport;
+    return programSDKVersion >= firstSDKVersionWithInitConstructorSupport;
 #endif
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-04-27  Mark Lam  <mark.lam@apple.com>
+
+        Address feedback from https://bugs.webkit.org/show_bug.cgi?id=157048#c5.
+        https://bugs.webkit.org/show_bug.cgi?id=157096
+
+        Reviewed by Geoffrey Garen.
+
+        1. Check for USE(APPLE_INTERNAL_SDK) instead of __has_include(<mach-o/dyld_priv.h>).
+        2. Rename webkitFirstSDKVersionWithInitConstructorSupport to
+           firstSDKVersionWithInitConstructorSupport.
+
+        * API/JSWrapperMap.mm:
+        (supportsInitMethodConstructors):
+
 2016-04-27  Mark Lam  <mark.lam@apple.com>