Changeset 174110 in webkit for trunk/Source/JavaScriptCore/API

Timestamp:

Sep 30, 2014, 11:40:32 AM (11 years ago)

Author:

[email protected]

Message:

REGRESSION (r172532): JSBase.h declares NSMapTable functions that are SPI
​https://bugs.webkit.org/show_bug.cgi?id=137170
<rdar://problem/18477384>

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Move conditional include of header Foundation/NSMapTablePriv.h and forward declarations
of NSMapTable SPI from file JavaScriptCore/API/JSBase.h to WTF/wtf/spi/cocoa/NSMapTableSPI.h.

• API/JSBase.h:
• API/JSManagedValue.mm: Include header WTF/wtf/spi/cocoa/NSMapTableSPI.h.
• API/JSVirtualMachine.mm: Ditto.
• API/JSVirtualMachineInternal.h: Forward declare class NSMapTable.
• API/JSWrapperMap.mm: Include header WTF/wtf/spi/cocoa/NSMapTableSPI.h. Also, order

#include directives such that they are sorted in alphabetical order.

Source/WTF:

Add SPI wrapper header, NSMapTableSPI.h.

Additionally, define convenience macro EXTERN_C that can be used to specify the C linkage
convention for a declaration. For example, the declaration "EXTERN_C const int x;" will
expand to:

extern const int x;

and

extern "C" const int x;

when used in a C and C++ file, respectively.

• WTF.xcodeproj/project.pbxproj:
• wtf/Compiler.h:
• wtf/spi/cocoa/NSMapTableSPI.h: Added.

Location:

trunk/Source/JavaScriptCore/API

Files:

• JSBase.h (modified) (1 diff)
• JSManagedValue.mm (modified) (1 diff)
• JSVirtualMachine.mm (modified) (1 diff)
• JSVirtualMachineInternal.h (modified) (1 diff)
• JSWrapperMap.mm (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSBase.h

@@ -33 +33 @@
 #ifdef __OBJC__
 #import <Foundation/Foundation.h>
-
-#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#if __has_include(<Foundation/NSMapTablePriv.h>)
-#import <Foundation/NSMapTablePriv.h>
-#else
-
-#ifndef __cplusplus
-extern "C" {
 #endif
-    void *NSMapGet(NSMapTable *, const void *key);
-    void NSMapInsert(NSMapTable *, const void *key, const void *value);
-    void NSMapRemove(NSMapTable *, const void *key);
-
-#ifndef __cplusplus
-}
-#endif
-#endif
-#endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-#endif // __OBJC__
 
 /* JavaScript engine interface */

trunk/Source/JavaScriptCore/API/JSManagedValue.mm

@@ -38 +38 @@
 #import "ObjcRuntimeExtras.h"
 #import "JSCInlines.h"
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
 
 class JSManagedValueHandleOwner : public JSC::WeakHandleOwner {

trunk/Source/JavaScriptCore/API/JSVirtualMachine.mm

@@ -38 +38 @@
 #import <mutex>
 #import <wtf/NeverDestroyed.h>
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
 
 static NSMapTable *globalWrapperCache = 0;

trunk/Source/JavaScriptCore/API/JSVirtualMachineInternal.h

@@ -37 +37 @@
 
 #if defined(__OBJC__)
+@class NSMapTable;
+
 @interface JSVirtualMachine(Internal)
 

trunk/Source/JavaScriptCore/API/JSWrapperMap.mm

@@ -31 +31 @@
 #import "APICast.h"
 #import "JSAPIWrapperObject.h"
+#import "JSCInlines.h"
 #import "JSCallbackObject.h"
 #import "JSContextInternal.h"
@@ -36 +37 @@
 #import "ObjCCallbackFunction.h"
 #import "ObjcRuntimeExtras.h"
-#import "JSCInlines.h"
 #import "WeakGCMap.h"
+#import <wtf/HashSet.h>
 #import <wtf/TCSpinLock.h>
 #import <wtf/Vector.h>
-#import <wtf/HashSet.h>
+#import <wtf/spi/cocoa/NSMapTableSPI.h>
 
 #include <mach-o/dyld.h>