JavaScriptCore:
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 19:04:21 +0000 (19:04 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 19:04:21 +0000 (19:04 +0000)
        Reviewed by Geoff.

        Don't build JavaScriptCore/bindings.

        * JavaScriptCore.exp:
        Export a couple of new functions.

        * JavaScriptCore.xcodeproj/project.pbxproj:
        Remove bindings/

        * kjs/config.h:
        No need to define HAVE_JNI anymore.

        * kjs/interpreter.cpp:
        Remove unnecessary include.

WebCore:

        Reviewed by Geoff.

        * WebCore.base.exp:
        Add the NPN and KJS methods.

        * WebCore.xcodeproj/project.pbxproj:
        Bring in bridge/

        * config.h:
        Add HAVE_JNI define.

        * bindings/js/kjs_html.cpp:
        * bindings/objc/DOMInternal.mm:
        * bindings/objc/DOMUtility.mm:
        * bindings/objc/WebScriptObject.mm:
        * html/HTMLAppletElement.cpp:
        * html/HTMLEmbedElement.cpp:
        * html/HTMLObjectElement.cpp:
        * html/HTMLPlugInElement.cpp:
        * page/Frame.cpp:
        * page/mac/FrameMac.mm:
        * page/mac/WebCoreFrameBridge.mm:
        * page/mac/WebCoreScriptDebugger.mm:
        * plugins/win/PluginViewWin.cpp:
        Include file changes.

WebKit/mac:

        Reviewed by Geoff.

        Include file changes.

        * Plugins/WebBaseNetscapePluginView.mm:
        * Plugins/WebNetscapePluginPackage.m:

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

25 files changed:
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.exp
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/kjs/config.h
JavaScriptCore/kjs/interpreter.cpp
WebCore/ChangeLog
WebCore/WebCore.base.exp
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/js/kjs_html.cpp
WebCore/bindings/objc/DOMInternal.mm
WebCore/bindings/objc/DOMUtility.mm
WebCore/bindings/objc/WebScriptObject.mm
WebCore/config.h
WebCore/html/HTMLAppletElement.cpp
WebCore/html/HTMLEmbedElement.cpp
WebCore/html/HTMLObjectElement.cpp
WebCore/html/HTMLPlugInElement.cpp
WebCore/page/Frame.cpp
WebCore/page/mac/FrameMac.mm
WebCore/page/mac/WebCoreFrameBridge.mm
WebCore/page/mac/WebCoreScriptDebugger.mm
WebCore/plugins/win/PluginViewWin.cpp
WebKit/mac/ChangeLog
WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
WebKit/mac/Plugins/WebNetscapePluginPackage.m

index ffc9e26..5a8bcca 100644 (file)
@@ -1,3 +1,21 @@
+2008-03-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        Don't build JavaScriptCore/bindings.
+        
+        * JavaScriptCore.exp:
+        Export a couple of new functions. 
+        
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        Remove bindings/
+        
+        * kjs/config.h:
+        No need to define HAVE_JNI anymore.
+        
+        * kjs/interpreter.cpp:
+        Remove unnecessary include.
+
 2008-03-04  David D. Kilzer  <ddkilzer@apple.com>
 
         Allow override of default script file name using command-line argument.
index 6e18b5d..5c95172 100644 (file)
@@ -66,16 +66,6 @@ _JSValueToNumber
 _JSValueToObject
 _JSValueToStringCopy
 _JSValueUnprotect
-_KJS_JSCreateNativeJSObject
-_KJS_JSObject_JSFinalize
-_KJS_JSObject_JSObjectCall
-_KJS_JSObject_JSObjectEval
-_KJS_JSObject_JSObjectGetMember
-_KJS_JSObject_JSObjectGetSlot
-_KJS_JSObject_JSObjectRemoveMember
-_KJS_JSObject_JSObjectSetMember
-_KJS_JSObject_JSObjectSetSlot
-_KJS_JSObject_JSObjectToString
 _WTFLog
 _WTFLogVerbose
 _WTFReportArgumentAssertionFailure
@@ -83,29 +73,9 @@ _WTFReportAssertionFailure
 _WTFReportAssertionFailureWithMessage
 _WTFReportError
 _WTFReportFatalError
-__NPN_CreateObject
-__NPN_DeallocateObject
-__NPN_Enumerate
-__NPN_Evaluate
-__NPN_GetIntIdentifier
-__NPN_GetProperty
-__NPN_GetStringIdentifier
-__NPN_GetStringIdentifiers
-__NPN_IdentifierIsString
-__NPN_Invoke
-__NPN_InvokeDefault
-__NPN_ReleaseObject
-__NPN_ReleaseVariantValue
-__NPN_RemoveProperty
-__NPN_RetainObject
-__NPN_SetException
-__NPN_SetProperty
-__NPN_UTF8FromIdentifier
 __Z12jsRegExpFreeP8JSRegExp
 __Z15jsRegExpCompilePKti24JSRegExpIgnoreCaseOption23JSRegExpMultilineOptionPjPPKc
 __Z15jsRegExpExecutePK8JSRegExpPKtiiPii
-__Z23_NPN_CreateScriptObjectP4_NPPPN3KJS8JSObjectEN3WTF10PassRefPtrINS1_8Bindings10RootObjectEEE
-__Z25_NPN_CreateNoScriptObjectv
 __ZN3KJS10Identifier11addSlowCaseEPNS_7UString3RepE
 __ZN3KJS10Identifier3addEPKNS_5UCharEi
 __ZN3KJS10Identifier3addEPKc
@@ -160,7 +130,6 @@ __ZN3KJS16JSVariableObject16getPropertyNamesEPNS_9ExecStateERNS_17PropertyNameAr
 __ZN3KJS16JSVariableObject19restoreLocalStorageERKNS_15SavedPropertiesE
 __ZN3KJS16ParserRefCounted3refEv
 __ZN3KJS16ParserRefCounted5derefEv
-__ZN3KJS16RuntimeObjectImp4infoE
 __ZN3KJS17PropertyNameArray3addERKNS_10IdentifierE
 __ZN3KJS17PrototypeFunctionC1EPNS_9ExecStateEPNS_17FunctionPrototypeEiRKNS_10IdentifierEPFPNS_7JSValueES2_PNS_8JSObjectERKNS_4ListEE
 __ZN3KJS17PrototypeFunctionC1EPNS_9ExecStateEiRKNS_10IdentifierEPFPNS_7JSValueES2_PNS_8JSObjectERKNS_4ListEE
@@ -189,21 +158,6 @@ __ZN3KJS7UStringC1EPKNS_5UCharEi
 __ZN3KJS7UStringC1EPKc
 __ZN3KJS7UStringC1ERKS0_S2_
 __ZN3KJS7UStringaSEPKc
-__ZN3KJS8Bindings10RootObject10invalidateEv
-__ZN3KJS8Bindings10RootObject11gcUnprotectEPNS_8JSObjectE
-__ZN3KJS8Bindings10RootObject17_createRootObjectE
-__ZN3KJS8Bindings10RootObject19setCreateRootObjectEPFN3WTF10PassRefPtrIS1_EEPvE
-__ZN3KJS8Bindings10RootObject6createEPKvPNS_14JSGlobalObjectE
-__ZN3KJS8Bindings10RootObject9gcProtectEPNS_8JSObjectE
-__ZN3KJS8Bindings10RootObjectD1Ev
-__ZN3KJS8Bindings10throwErrorEPNS_9ExecStateENS_9ErrorTypeEP8NSString
-__ZN3KJS8Bindings23convertObjcValueToValueEPNS_9ExecStateEPvNS0_13ObjcValueTypeEPNS0_10RootObjectE
-__ZN3KJS8Bindings23convertValueToObjcValueEPNS_9ExecStateEPNS_7JSValueENS0_13ObjcValueTypeE
-__ZN3KJS8Bindings24findProtectingRootObjectEPNS_8JSObjectE
-__ZN3KJS8Bindings8Instance18didExecuteFunctionEv
-__ZN3KJS8Bindings8Instance19createRuntimeObjectEPS1_
-__ZN3KJS8Bindings8Instance21setDidExecuteFunctionEPFvPNS_9ExecStateEPNS_8JSObjectEE
-__ZN3KJS8Bindings8Instance32createBindingForLanguageInstanceENS1_15BindingLanguageEPvN3WTF10PassRefPtrINS0_10RootObjectEEE
 __ZN3KJS8Debugger12sourceUnusedEPNS_9ExecStateEi
 __ZN3KJS8Debugger6attachEPNS_14JSGlobalObjectE
 __ZN3KJS8Debugger6detachEPNS_14JSGlobalObjectE
@@ -288,8 +242,6 @@ __ZNK3KJS7UString5asciiEv
 __ZNK3KJS7UString6is8BitEv
 __ZNK3KJS7UString8toUInt32EPb
 __ZNK3KJS7UString8toUInt32EPbb
-__ZNK3KJS8Bindings10RootObject12globalObjectEv
-__ZNK3KJS8Bindings8Instance10rootObjectEv
 __ZNK3KJS8JSObject11hasPropertyEPNS_9ExecStateERKNS_10IdentifierE
 __ZNK3KJS8JSObject12defaultValueEPNS_9ExecStateENS_6JSTypeE
 __ZNK3KJS8JSObject14implementsCallEv
@@ -315,3 +267,8 @@ _jscore_collector_introspection
 _jscore_fastmalloc_introspection
 _kJSClassDefinitionEmpty
 _kjs_strtod
+__ZN3KJS10throwErrorEPNS_9ExecStateENS_9ErrorTypeERKNS_7UStringE
+__ZNK3KJS8JSObject11hasPropertyEPNS_9ExecStateEj
+__ZN3KJS7UString6appendEPKc
+__ZN3KJS7CStringaSERKS0_
+
index a434192..c126930 100644 (file)
                14F252610D08DF2F004ECFFF /* JSVariableObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14F252600D08DF2F004ECFFF /* JSVariableObject.cpp */; };
                1CAA8B4C0D32C39A0041BCFF /* JavaScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1CAA8B4D0D32C39A0041BCFF /* JavaScriptCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */; settings = {ATTRIBUTES = (Public, ); }; };
-               1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAF34880A6C421700ABE06E /* WebScriptObject.h */; };
                5186111E0CC824900081412B /* Deque.h in Headers */ = {isa = PBXBuildFile; fileRef = 5186111D0CC824830081412B /* Deque.h */; settings = {ATTRIBUTES = (Private, ); }; };
                51F648D70BB4E2CA0033D760 /* RetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F648D60BB4E2CA0033D760 /* RetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5DA479660CFBCF56009328A0 /* TCPackedCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DA479650CFBCF56009328A0 /* TCPackedCache.h */; };
-               5DAF21B00D1B1ED60000B392 /* npruntime_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5DBD18AC0C54018700C15EAE /* CollectorHeapIntrospector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */; };
                5DBD18B00C5401A700C15EAE /* MallocZoneSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */; };
                652246A50C8D7A0E007BDAF7 /* HashIterators.h in Headers */ = {isa = PBXBuildFile; fileRef = 652246A40C8D7A0E007BDAF7 /* HashIterators.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B6A0822A1C700736975 /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 931C6CEF038EE8DE008635CE /* list.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B6B0822A1C700736975 /* dtoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 651F6413039D5B5F0078395C /* dtoa.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B6C0822A1C700736975 /* pcre.h in Headers */ = {isa = PBXBuildFile; fileRef = 6541720F039E08B90058BFEB /* pcre.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B6F0822A1C700736975 /* jni_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51856D900562EE95008B9D83 /* jni_utility.h */; };
-               932F5B700822A1C700736975 /* runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0870056468730080E486 /* runtime.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B710822A1C700736975 /* jni_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 511B0876056468BB0080E486 /* jni_runtime.h */; };
                932F5B720822A1C700736975 /* bool_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 704FD35305697E6D003DBED9 /* bool_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B730822A1C700736975 /* runtime_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 70B16A270569A10900DB756D /* runtime_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B740822A1C700736975 /* jni_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 517D52DD056BF2F6003851BD /* jni_class.h */; };
-               932F5B750822A1C700736975 /* jni_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 517D5348056BFB5D003851BD /* jni_instance.h */; settings = {ATTRIBUTES = (); }; };
-               932F5B760822A1C700736975 /* runtime_method.h in Headers */ = {isa = PBXBuildFile; fileRef = 51A58A8E057D3A6A00A3E942 /* runtime_method.h */; };
-               932F5B770822A1C700736975 /* runtime_array.h in Headers */ = {isa = PBXBuildFile; fileRef = 7073BE3D0581291E005EE2C9 /* runtime_array.h */; };
-               932F5B780822A1C700736975 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 513DF74105C0861F00F89391 /* jni_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B790822A1C700736975 /* objc_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 51C4974105C0A5D4006FBFF5 /* objc_runtime.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B7A0822A1C700736975 /* objc_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 518CF93605C72271003CF905 /* objc_class.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B7B0822A1C700736975 /* objc_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EB0005C85A6300E6DF1B /* objc_instance.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B7C0822A1C700736975 /* objc_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC1005C86F3500E6DF1B /* objc_header.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B7D0822A1C700736975 /* objc_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F0EC9605C88DC700E6DF1B /* objc_utility.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B7F0822A1C700736975 /* runtime_root.h in Headers */ = {isa = PBXBuildFile; fileRef = 5114F47C05E4426200D1BBBD /* runtime_root.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B800822A1C700736975 /* c_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 5182A45705FFCF4B00CBD2F2 /* c_instance.h */; };
-               932F5B810822A1C700736975 /* c_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5182A47005FFD45000CBD2F2 /* c_utility.h */; };
-               932F5B820822A1C700736975 /* c_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 5182A48C05FFFDC400CBD2F2 /* c_runtime.h */; };
-               932F5B830822A1C700736975 /* c_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 5182A53B06012C3000CBD2F2 /* c_class.h */; };
-               932F5B840822A1C700736975 /* NP_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 517BE7F40610E39600221947 /* NP_jsobject.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B850822A1C700736975 /* npruntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 5199B1BE061B65BC0070C006 /* npruntime.h */; settings = {ATTRIBUTES = (Private, ); }; };
                932F5B880822A1C700736975 /* protect.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C02FBB0637462A003E7EE6 /* protect.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B8C0822A1C700736975 /* npapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 51CA3B4F06CC2166005600E3 /* npapi.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5B8D0822A1C700736975 /* npruntime_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 51DFF2C906CC36F6006F1ECC /* npruntime_priv.h */; };
-               932F5B8E0822A1C700736975 /* npruntime_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               932F5BB70822A1C700736975 /* jni_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51856D8F0562EE95008B9D83 /* jni_utility.cpp */; };
-               932F5BB80822A1C700736975 /* jni_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 511B0877056468BB0080E486 /* jni_runtime.cpp */; };
-               932F5BB90822A1C700736975 /* runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 704FD44505698F17003DBED9 /* runtime.cpp */; };
-               932F5BBA0822A1C700736975 /* runtime_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70B16A260569A10900DB756D /* runtime_object.cpp */; };
-               932F5BBB0822A1C700736975 /* jni_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517D52DC056BF2F5003851BD /* jni_class.cpp */; };
-               932F5BBC0822A1C700736975 /* jni_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517D5347056BFB5D003851BD /* jni_instance.cpp */; };
-               932F5BBD0822A1C700736975 /* runtime_method.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51A58A8D057D3A6A00A3E942 /* runtime_method.cpp */; };
-               932F5BBE0822A1C700736975 /* runtime_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7073BE3C0581291E005EE2C9 /* runtime_array.cpp */; };
-               932F5BBF0822A1C700736975 /* jni_jsobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513DF74005C0861F00F89391 /* jni_jsobject.cpp */; };
-               932F5BC00822A1C700736975 /* objc_class.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518CF93705C72271003CF905 /* objc_class.mm */; };
-               932F5BC10822A1C700736975 /* objc_runtime.mm in Sources */ = {isa = PBXBuildFile; fileRef = 518CF93805C72271003CF905 /* objc_runtime.mm */; };
-               932F5BC20822A1C700736975 /* objc_instance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F0EB0505C85A9000E6DF1B /* objc_instance.mm */; };
-               932F5BC30822A1C700736975 /* objc_utility.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F0EC9705C88DC700E6DF1B /* objc_utility.mm */; };
-               932F5BC50822A1C700736975 /* runtime_root.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5114F47B05E4426200D1BBBD /* runtime_root.cpp */; };
-               932F5BC60822A1C700736975 /* NP_jsobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51532CC705F7FD2C00EC779C /* NP_jsobject.cpp */; };
-               932F5BC70822A1C700736975 /* c_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5182A45605FFCF4B00CBD2F2 /* c_instance.cpp */; };
-               932F5BC80822A1C700736975 /* c_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5182A48B05FFFDC400CBD2F2 /* c_runtime.cpp */; };
-               932F5BC90822A1C700736975 /* c_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5182A4FB06010F8200CBD2F2 /* c_utility.cpp */; };
-               932F5BCA0822A1C700736975 /* c_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5182A53A06012C3000CBD2F2 /* c_class.cpp */; };
-               932F5BCB0822A1C700736975 /* npruntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5199B1BD061B65BC0070C006 /* npruntime.cpp */; };
-               932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517EF37306D695930007C1BA /* jni_objc.mm */; };
                932F5BD30822A1C700736975 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
                932F5BD40822A1C700736975 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A63D04B3B69F008AE952 /* CoreServices.framework */; };
                932F5BD50822A1C700736975 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F0EB6105C86C6B00E6DF1B /* Foundation.framework */; };
                1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
                1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
                1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
-               1CAF34880A6C421700ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.h; sourceTree = "<group>"; };
                45E12D8806A49B0F00E9DF84 /* testkjs.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 4; };
-               5114F47B05E4426200D1BBBD /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bindings/runtime_root.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5114F47C05E4426200D1BBBD /* runtime_root.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime_root.h; path = bindings/runtime_root.h; sourceTree = "<group>"; tabWidth = 8; };
-               511B0870056468730080E486 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime.h; path = bindings/runtime.h; sourceTree = "<group>"; tabWidth = 8; };
-               511B0876056468BB0080E486 /* jni_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_runtime.h; path = bindings/jni/jni_runtime.h; sourceTree = "<group>"; tabWidth = 8; };
-               511B0877056468BB0080E486 /* jni_runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_runtime.cpp; path = bindings/jni/jni_runtime.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               513DF74005C0861F00F89391 /* jni_jsobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_jsobject.cpp; path = bindings/jni/jni_jsobject.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               513DF74105C0861F00F89391 /* jni_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_jsobject.h; path = bindings/jni/jni_jsobject.h; sourceTree = "<group>"; tabWidth = 8; };
-               51532CC705F7FD2C00EC779C /* NP_jsobject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NP_jsobject.cpp; path = bindings/NP_jsobject.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               517BE7F40610E39600221947 /* NP_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = NP_jsobject.h; path = bindings/NP_jsobject.h; sourceTree = "<group>"; tabWidth = 8; };
-               517D52DC056BF2F5003851BD /* jni_class.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_class.cpp; path = bindings/jni/jni_class.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               517D52DD056BF2F6003851BD /* jni_class.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_class.h; path = bindings/jni/jni_class.h; sourceTree = "<group>"; tabWidth = 8; };
-               517D5347056BFB5D003851BD /* jni_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_instance.cpp; path = bindings/jni/jni_instance.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               517D5348056BFB5D003851BD /* jni_instance.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_instance.h; path = bindings/jni/jni_instance.h; sourceTree = "<group>"; tabWidth = 8; };
-               517EF37306D695930007C1BA /* jni_objc.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = jni_objc.mm; path = bindings/jni/jni_objc.mm; sourceTree = "<group>"; tabWidth = 8; };
-               5182A45605FFCF4B00CBD2F2 /* c_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_instance.cpp; path = bindings/c/c_instance.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5182A45705FFCF4B00CBD2F2 /* c_instance.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = c_instance.h; path = bindings/c/c_instance.h; sourceTree = "<group>"; tabWidth = 8; };
-               5182A47005FFD45000CBD2F2 /* c_utility.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = c_utility.h; path = bindings/c/c_utility.h; sourceTree = "<group>"; tabWidth = 8; };
-               5182A48B05FFFDC400CBD2F2 /* c_runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_runtime.cpp; path = bindings/c/c_runtime.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5182A48C05FFFDC400CBD2F2 /* c_runtime.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = c_runtime.h; path = bindings/c/c_runtime.h; sourceTree = "<group>"; tabWidth = 8; };
-               5182A4FB06010F8200CBD2F2 /* c_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_utility.cpp; path = bindings/c/c_utility.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5182A53A06012C3000CBD2F2 /* c_class.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = c_class.cpp; path = bindings/c/c_class.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5182A53B06012C3000CBD2F2 /* c_class.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = c_class.h; path = bindings/c/c_class.h; sourceTree = "<group>"; tabWidth = 8; };
-               51856D8F0562EE95008B9D83 /* jni_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jni_utility.cpp; path = bindings/jni/jni_utility.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               51856D900562EE95008B9D83 /* jni_utility.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = jni_utility.h; path = bindings/jni/jni_utility.h; sourceTree = "<group>"; tabWidth = 8; };
                5186111D0CC824830081412B /* Deque.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Deque.h; sourceTree = "<group>"; };
-               518CF93605C72271003CF905 /* objc_class.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_class.h; path = bindings/objc/objc_class.h; sourceTree = "<group>"; tabWidth = 8; };
-               518CF93705C72271003CF905 /* objc_class.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_class.mm; path = bindings/objc/objc_class.mm; sourceTree = "<group>"; tabWidth = 8; };
-               518CF93805C72271003CF905 /* objc_runtime.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_runtime.mm; path = bindings/objc/objc_runtime.mm; sourceTree = "<group>"; tabWidth = 8; };
-               5199B1BD061B65BC0070C006 /* npruntime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = npruntime.cpp; path = bindings/npruntime.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               5199B1BE061B65BC0070C006 /* npruntime.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = npruntime.h; path = bindings/npruntime.h; sourceTree = "<group>"; tabWidth = 8; };
-               51A58A8D057D3A6A00A3E942 /* runtime_method.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_method.cpp; path = bindings/runtime_method.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               51A58A8E057D3A6A00A3E942 /* runtime_method.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime_method.h; path = bindings/runtime_method.h; sourceTree = "<group>"; tabWidth = 8; };
-               51C4974105C0A5D4006FBFF5 /* objc_runtime.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_runtime.h; path = bindings/objc/objc_runtime.h; sourceTree = "<group>"; tabWidth = 8; };
-               51CA3B4F06CC2166005600E3 /* npapi.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = npapi.h; path = bindings/npapi.h; sourceTree = "<group>"; tabWidth = 8; };
-               51DFF2C906CC36F6006F1ECC /* npruntime_priv.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_priv.h; path = bindings/npruntime_priv.h; sourceTree = "<group>"; tabWidth = 8; };
-               51F0EB0005C85A6300E6DF1B /* objc_instance.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_instance.h; path = bindings/objc/objc_instance.h; sourceTree = "<group>"; tabWidth = 8; };
-               51F0EB0505C85A9000E6DF1B /* objc_instance.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_instance.mm; path = bindings/objc/objc_instance.mm; sourceTree = "<group>"; tabWidth = 8; };
                51F0EB6105C86C6B00E6DF1B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
                51F0EC0705C86C9A00E6DF1B /* libobjc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libobjc.dylib; path = /usr/lib/libobjc.dylib; sourceTree = "<absolute>"; };
-               51F0EC1005C86F3500E6DF1B /* objc_header.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_header.h; path = bindings/objc/objc_header.h; sourceTree = "<group>"; tabWidth = 8; };
-               51F0EC9605C88DC700E6DF1B /* objc_utility.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = objc_utility.h; path = bindings/objc/objc_utility.h; sourceTree = "<group>"; tabWidth = 8; };
-               51F0EC9705C88DC700E6DF1B /* objc_utility.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = objc_utility.mm; path = bindings/objc/objc_utility.mm; sourceTree = "<group>"; tabWidth = 8; };
                51F648D60BB4E2CA0033D760 /* RetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RetainPtr.h; sourceTree = "<group>"; };
                5DA479650CFBCF56009328A0 /* TCPackedCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TCPackedCache.h; sourceTree = "<group>"; };
-               5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_internal.h; path = bindings/npruntime_internal.h; sourceTree = "<group>"; };
                5DBD18A90C54018700C15EAE /* CollectorHeapIntrospector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CollectorHeapIntrospector.cpp; sourceTree = "<group>"; };
                5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectorHeapIntrospector.h; sourceTree = "<group>"; };
                5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocZoneSupport.h; sourceTree = "<group>"; };
                65FB3F4909D11B2400F49DEB /* grammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = file; name = grammar.h; path = ../../../../../symroots/Debug/DerivedSources/JavaScriptCore/grammar.h; sourceTree = "<group>"; };
                65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = file; name = regexp_object.lut.h; path = ../../../../../symroots/Debug/DerivedSources/JavaScriptCore/regexp_object.lut.h; sourceTree = "<group>"; };
                704FD35305697E6D003DBED9 /* bool_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = bool_object.h; sourceTree = "<group>"; tabWidth = 8; };
-               704FD44505698F17003DBED9 /* runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime.cpp; path = bindings/runtime.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               7073BE3C0581291E005EE2C9 /* runtime_array.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_array.cpp; path = bindings/runtime_array.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               7073BE3D0581291E005EE2C9 /* runtime_array.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime_array.h; path = bindings/runtime_array.h; sourceTree = "<group>"; tabWidth = 8; };
-               70B16A260569A10900DB756D /* runtime_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_object.cpp; path = bindings/runtime_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               70B16A270569A10900DB756D /* runtime_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = runtime_object.h; path = bindings/runtime_object.h; sourceTree = "<group>"; tabWidth = 8; };
                7E2C6C950D31C6AB002D44E2 /* Activation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Activation.h; sourceTree = "<group>"; };
                7E2C6C980D31C6B6002D44E2 /* scope_chain_mark.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scope_chain_mark.h; sourceTree = "<group>"; };
-               84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_impl.h; path = bindings/npruntime_impl.h; sourceTree = "<group>"; tabWidth = 8; };
                9303F567099118FA00AD71B8 /* OwnPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnPtr.h; sourceTree = "<group>"; };
                9303F5690991190000AD71B8 /* Noncopyable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Noncopyable.h; sourceTree = "<group>"; };
                9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OwnArrayPtr.h; sourceTree = "<group>"; };
                                65162EF108E6A21C007556CD /* wtf */,
                                65417203039E01F90058BFEB /* pcre */,
                                65417200039E01BA0058BFEB /* kjs */,
-                               51856D950562EE9C008B9D83 /* bindings */,
                                1432EBD70A34CAD400717B9F /* API */,
                                141211000A48772600480255 /* tests */,
                                650FDF8D09D0FCA700769E54 /* Derived Sources */,
                        tabWidth = 4;
                        usesTabs = 0;
                };
-               51856D950562EE9C008B9D83 /* bindings */ = {
-                       isa = PBXGroup;
-                       children = (
-                               5DAF21AF0D1B1ED60000B392 /* npruntime_internal.h */,
-                               5182A53A06012C3000CBD2F2 /* c_class.cpp */,
-                               5182A53B06012C3000CBD2F2 /* c_class.h */,
-                               5182A45605FFCF4B00CBD2F2 /* c_instance.cpp */,
-                               5182A45705FFCF4B00CBD2F2 /* c_instance.h */,
-                               5182A48B05FFFDC400CBD2F2 /* c_runtime.cpp */,
-                               5182A48C05FFFDC400CBD2F2 /* c_runtime.h */,
-                               5182A4FB06010F8200CBD2F2 /* c_utility.cpp */,
-                               5182A47005FFD45000CBD2F2 /* c_utility.h */,
-                               517D52DC056BF2F5003851BD /* jni_class.cpp */,
-                               517D52DD056BF2F6003851BD /* jni_class.h */,
-                               517D5347056BFB5D003851BD /* jni_instance.cpp */,
-                               517D5348056BFB5D003851BD /* jni_instance.h */,
-                               513DF74005C0861F00F89391 /* jni_jsobject.cpp */,
-                               513DF74105C0861F00F89391 /* jni_jsobject.h */,
-                               517EF37306D695930007C1BA /* jni_objc.mm */,
-                               511B0877056468BB0080E486 /* jni_runtime.cpp */,
-                               511B0876056468BB0080E486 /* jni_runtime.h */,
-                               51856D8F0562EE95008B9D83 /* jni_utility.cpp */,
-                               51856D900562EE95008B9D83 /* jni_utility.h */,
-                               51532CC705F7FD2C00EC779C /* NP_jsobject.cpp */,
-                               517BE7F40610E39600221947 /* NP_jsobject.h */,
-                               51CA3B4F06CC2166005600E3 /* npapi.h */,
-                               5199B1BD061B65BC0070C006 /* npruntime.cpp */,
-                               5199B1BE061B65BC0070C006 /* npruntime.h */,
-                               84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */,
-                               51DFF2C906CC36F6006F1ECC /* npruntime_priv.h */,
-                               518CF93605C72271003CF905 /* objc_class.h */,
-                               518CF93705C72271003CF905 /* objc_class.mm */,
-                               51F0EC1005C86F3500E6DF1B /* objc_header.h */,
-                               51F0EB0005C85A6300E6DF1B /* objc_instance.h */,
-                               51F0EB0505C85A9000E6DF1B /* objc_instance.mm */,
-                               51C4974105C0A5D4006FBFF5 /* objc_runtime.h */,
-                               518CF93805C72271003CF905 /* objc_runtime.mm */,
-                               51F0EC9605C88DC700E6DF1B /* objc_utility.h */,
-                               51F0EC9705C88DC700E6DF1B /* objc_utility.mm */,
-                               704FD44505698F17003DBED9 /* runtime.cpp */,
-                               511B0870056468730080E486 /* runtime.h */,
-                               7073BE3C0581291E005EE2C9 /* runtime_array.cpp */,
-                               7073BE3D0581291E005EE2C9 /* runtime_array.h */,
-                               51A58A8D057D3A6A00A3E942 /* runtime_method.cpp */,
-                               51A58A8E057D3A6A00A3E942 /* runtime_method.h */,
-                               70B16A260569A10900DB756D /* runtime_object.cpp */,
-                               70B16A270569A10900DB756D /* runtime_object.h */,
-                               5114F47B05E4426200D1BBBD /* runtime_root.cpp */,
-                               5114F47C05E4426200D1BBBD /* runtime_root.h */,
-                               1CAF34880A6C421700ABE06E /* WebScriptObject.h */,
-                       );
-                       name = bindings;
-                       sourceTree = "<group>";
-                       tabWidth = 4;
-                       usesTabs = 0;
-               };
                650FDF8D09D0FCA700769E54 /* Derived Sources */ = {
                        isa = PBXGroup;
                        children = (
                                5DBD18B00C5401A700C15EAE /* MallocZoneSupport.h in Headers */,
                                BCF655590A2049710038A194 /* MathExtras.h in Headers */,
                                E1EE798C0D6CA53D00FEA3BA /* MessageQueue.h in Headers */,
-                               932F5B840822A1C700736975 /* NP_jsobject.h in Headers */,
                                9303F56A0991190000AD71B8 /* Noncopyable.h in Headers */,
                                9303F5A509911A5800AD71B8 /* OwnArrayPtr.h in Headers */,
                                9303F568099118FA00AD71B8 /* OwnPtr.h in Headers */,
                                935AF46E09E9D9DB00ACD1D8 /* UnusedParam.h in Headers */,
                                6592C318098B7DE10003D4F6 /* Vector.h in Headers */,
                                6592C319098B7DE10003D4F6 /* VectorTraits.h in Headers */,
-                               1CAF34890A6C421700ABE06E /* WebScriptObject.h in Headers */,
                                932F5B670822A1C700736975 /* array_instance.h in Headers */,
                                932F5B400822A1C700736975 /* array_object.h in Headers */,
                                65B1749A09D0FEB700820339 /* array_object.lut.h in Headers */,
                                932F5B720822A1C700736975 /* bool_object.h in Headers */,
-                               932F5B830822A1C700736975 /* c_class.h in Headers */,
-                               932F5B800822A1C700736975 /* c_instance.h in Headers */,
-                               932F5B820822A1C700736975 /* c_runtime.h in Headers */,
-                               932F5B810822A1C700736975 /* c_utility.h in Headers */,
                                932F5B420822A1C700736975 /* collector.h in Headers */,
                                932F5B650822A1C700736975 /* completion.h in Headers */,
                                932F5B600822A1C700736975 /* config.h in Headers */,
                                932F5B660822A1C700736975 /* identifier.h in Headers */,
                                932F5B490822A1C700736975 /* internal.h in Headers */,
                                932F5B4A0822A1C700736975 /* interpreter.h in Headers */,
-                               932F5B740822A1C700736975 /* jni_class.h in Headers */,
-                               932F5B750822A1C700736975 /* jni_instance.h in Headers */,
-                               932F5B780822A1C700736975 /* jni_jsobject.h in Headers */,
-                               932F5B710822A1C700736975 /* jni_runtime.h in Headers */,
-                               932F5B6F0822A1C700736975 /* jni_utility.h in Headers */,
                                932F5B4B0822A1C700736975 /* lexer.h in Headers */,
                                65FB3EB309D109F000F49DEB /* lexer.lut.h in Headers */,
                                932F5B6A0822A1C700736975 /* list.h in Headers */,
                                932F5B4E0822A1C700736975 /* math_object.h in Headers */,
                                65B174F509D100FA00820339 /* math_object.lut.h in Headers */,
                                932F5B500822A1C700736975 /* nodes.h in Headers */,
-                               932F5B8C0822A1C700736975 /* npapi.h in Headers */,
-                               932F5B850822A1C700736975 /* npruntime.h in Headers */,
-                               932F5B8E0822A1C700736975 /* npruntime_impl.h in Headers */,
-                               5DAF21B00D1B1ED60000B392 /* npruntime_internal.h in Headers */,
-                               932F5B8D0822A1C700736975 /* npruntime_priv.h in Headers */,
                                932F5B510822A1C700736975 /* number_object.h in Headers */,
                                65B174F609D100FA00820339 /* number_object.lut.h in Headers */,
-                               932F5B7A0822A1C700736975 /* objc_class.h in Headers */,
-                               932F5B7C0822A1C700736975 /* objc_header.h in Headers */,
-                               932F5B7B0822A1C700736975 /* objc_instance.h in Headers */,
-                               932F5B790822A1C700736975 /* objc_runtime.h in Headers */,
-                               932F5B7D0822A1C700736975 /* objc_utility.h in Headers */,
                                932F5B540822A1C700736975 /* object.h in Headers */,
                                932F5B530822A1C700736975 /* object_object.h in Headers */,
                                932F5B550822A1C700736975 /* operations.h in Headers */,
                                932F5B580822A1C700736975 /* regexp.h in Headers */,
                                932F5B570822A1C700736975 /* regexp_object.h in Headers */,
                                65FB3F5409D11B2400F49DEB /* regexp_object.lut.h in Headers */,
-                               932F5B700822A1C700736975 /* runtime.h in Headers */,
-                               932F5B770822A1C700736975 /* runtime_array.h in Headers */,
-                               932F5B760822A1C700736975 /* runtime_method.h in Headers */,
-                               932F5B730822A1C700736975 /* runtime_object.h in Headers */,
-                               932F5B7F0822A1C700736975 /* runtime_root.h in Headers */,
                                932F5B680822A1C700736975 /* scope_chain.h in Headers */,
                                932F5B590822A1C700736975 /* string_object.h in Headers */,
                                65B174F809D100FA00820339 /* string_object.lut.h in Headers */,
                                146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
                                14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
                                14F252610D08DF2F004ECFFF /* JSVariableObject.cpp in Sources */,
-                               932F5BC60822A1C700736975 /* NP_jsobject.cpp in Sources */,
                                E1EF79AA0CE97BA60088D500 /* UTF8.cpp in Sources */,
-                               932F5BCA0822A1C700736975 /* c_class.cpp in Sources */,
-                               932F5BC70822A1C700736975 /* c_instance.cpp in Sources */,
-                               932F5BC80822A1C700736975 /* c_runtime.cpp in Sources */,
-                               932F5BC90822A1C700736975 /* c_utility.cpp in Sources */,
-                               932F5BBB0822A1C700736975 /* jni_class.cpp in Sources */,
-                               932F5BBC0822A1C700736975 /* jni_instance.cpp in Sources */,
-                               932F5BBF0822A1C700736975 /* jni_jsobject.cpp in Sources */,
-                               932F5BCF0822A1C700736975 /* jni_objc.mm in Sources */,
-                               932F5BB80822A1C700736975 /* jni_runtime.cpp in Sources */,
-                               932F5BB70822A1C700736975 /* jni_utility.cpp in Sources */,
-                               932F5BCB0822A1C700736975 /* npruntime.cpp in Sources */,
-                               932F5BC00822A1C700736975 /* objc_class.mm in Sources */,
-                               932F5BC20822A1C700736975 /* objc_instance.mm in Sources */,
-                               932F5BC10822A1C700736975 /* objc_runtime.mm in Sources */,
-                               932F5BC30822A1C700736975 /* objc_utility.mm in Sources */,
                                930754C108B0F68000AB3056 /* pcre_compile.cpp in Sources */,
                                930754EB08B0F78500AB3056 /* pcre_exec.cpp in Sources */,
                                930754D008B0F74600AB3056 /* pcre_tables.cpp in Sources */,
                                937013480CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp in Sources */,
                                93E26BD408B1514100F85226 /* pcre_xclass.cpp in Sources */,
-                               932F5BB90822A1C700736975 /* runtime.cpp in Sources */,
-                               932F5BBE0822A1C700736975 /* runtime_array.cpp in Sources */,
-                               932F5BBD0822A1C700736975 /* runtime_method.cpp in Sources */,
-                               932F5BBA0822A1C700736975 /* runtime_object.cpp in Sources */,
-                               932F5BC50822A1C700736975 /* runtime_root.cpp in Sources */,
                                E1EE793D0D6C9B9200FEA3BA /* ThreadingPthreads.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index 22ae717..99d16f7 100644 (file)
 
 #include <wtf/Platform.h>
 
-#if PLATFORM(MAC)
-#define HAVE_JNI 1
-#endif
-
 #if PLATFORM(DARWIN)
 
 #define HAVE_ERRNO_H 1
index a15b6d3..3bb5dac 100644 (file)
@@ -42,7 +42,6 @@
 #include "object_object.h"
 #include "operations.h"
 #include "regexp_object.h"
-#include "runtime.h"
 #include "string_object.h"
 #include "types.h"
 #include "value.h"
index 5eb1a64..909446d 100644 (file)
@@ -1,3 +1,31 @@
+2008-03-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        * WebCore.base.exp:
+        Add the NPN and KJS methods.
+        
+        * WebCore.xcodeproj/project.pbxproj:
+        Bring in bridge/
+
+        * config.h:
+        Add HAVE_JNI define.
+        
+        * bindings/js/kjs_html.cpp:
+        * bindings/objc/DOMInternal.mm:
+        * bindings/objc/DOMUtility.mm:
+        * bindings/objc/WebScriptObject.mm:
+        * html/HTMLAppletElement.cpp:
+        * html/HTMLEmbedElement.cpp:
+        * html/HTMLObjectElement.cpp:
+        * html/HTMLPlugInElement.cpp:
+        * page/Frame.cpp:
+        * page/mac/FrameMac.mm:
+        * page/mac/WebCoreFrameBridge.mm:
+        * page/mac/WebCoreScriptDebugger.mm:
+        * plugins/win/PluginViewWin.cpp:
+        Include file changes.
+
 2008-03-04  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam.
index ea4effc..807fde7 100644 (file)
@@ -762,3 +762,30 @@ _wkSetUpFontCache
 _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
+__NPN_UTF8FromIdentifier
+__NPN_SetException
+__NPN_ReleaseVariantValue
+__NPN_Evaluate
+__NPN_GetProperty
+__NPN_SetProperty
+__NPN_Invoke
+__NPN_RemoveProperty
+__NPN_RetainObject
+__NPN_GetIntIdentifier
+__NPN_ReleaseObject
+__NPN_Enumerate
+__NPN_GetStringIdentifier
+__NPN_GetStringIdentifiers
+__NPN_IdentifierIsString
+__NPN_InvokeDefault
+__NPN_CreateObject
+_KJS_JSCreateNativeJSObject
+_KJS_JSObject_JSFinalize
+_KJS_JSObject_JSObjectCall
+_KJS_JSObject_JSObjectEval
+_KJS_JSObject_JSObjectGetMember
+_KJS_JSObject_JSObjectGetSlot
+_KJS_JSObject_JSObjectRemoveMember
+_KJS_JSObject_JSObjectSetMember
+_KJS_JSObject_JSObjectSetSlot
+_KJS_JSObject_JSObjectToString
index 36afa90..32195b1 100644 (file)
                1A4A954D0B4EDCCB002D8C3C /* SharedBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */; };
                1A4A954E0B4EDCCB002D8C3C /* SharedBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A4A95520B4EDCFF002D8C3C /* SharedBufferMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */; };
+               1A569CF70D7E2B82007C3983 /* c_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CC60D7E2B82007C3983 /* c_class.cpp */; };
+               1A569CF80D7E2B82007C3983 /* c_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CC70D7E2B82007C3983 /* c_class.h */; };
+               1A569CF90D7E2B82007C3983 /* c_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CC80D7E2B82007C3983 /* c_instance.cpp */; };
+               1A569CFA0D7E2B82007C3983 /* c_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CC90D7E2B82007C3983 /* c_instance.h */; };
+               1A569CFB0D7E2B82007C3983 /* c_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCA0D7E2B82007C3983 /* c_runtime.cpp */; };
+               1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CCB0D7E2B82007C3983 /* c_runtime.h */; };
+               1A569CFD0D7E2B82007C3983 /* c_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCC0D7E2B82007C3983 /* c_utility.cpp */; };
+               1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CCD0D7E2B82007C3983 /* c_utility.h */; };
+               1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CCF0D7E2B82007C3983 /* jni_class.cpp */; };
+               1A569D000D7E2B82007C3983 /* jni_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD00D7E2B82007C3983 /* jni_class.h */; };
+               1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD10D7E2B82007C3983 /* jni_instance.cpp */; };
+               1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD20D7E2B82007C3983 /* jni_instance.h */; };
+               1A569D030D7E2B82007C3983 /* jni_jsobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD30D7E2B82007C3983 /* jni_jsobject.cpp */; };
+               1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD40D7E2B82007C3983 /* jni_jsobject.h */; };
+               1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD50D7E2B82007C3983 /* jni_objc.mm */; };
+               1A569D060D7E2B82007C3983 /* jni_runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD60D7E2B82007C3983 /* jni_runtime.cpp */; };
+               1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD70D7E2B82007C3983 /* jni_runtime.h */; };
+               1A569D080D7E2B82007C3983 /* jni_utility.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CD80D7E2B82007C3983 /* jni_utility.cpp */; };
+               1A569D090D7E2B82007C3983 /* jni_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CD90D7E2B82007C3983 /* jni_utility.h */; };
+               1A569D0A0D7E2B82007C3983 /* NP_jsobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CDA0D7E2B82007C3983 /* NP_jsobject.cpp */; };
+               1A569D0B0D7E2B82007C3983 /* NP_jsobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CDB0D7E2B82007C3983 /* NP_jsobject.h */; };
+               1A569D0C0D7E2B82007C3983 /* npapi.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CDC0D7E2B82007C3983 /* npapi.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A569D0D0D7E2B82007C3983 /* npruntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CDD0D7E2B82007C3983 /* npruntime.cpp */; };
+               1A569D0E0D7E2B82007C3983 /* npruntime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CDE0D7E2B82007C3983 /* npruntime.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A569D0F0D7E2B82007C3983 /* npruntime_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CDF0D7E2B82007C3983 /* npruntime_impl.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A569D100D7E2B82007C3983 /* npruntime_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE00D7E2B82007C3983 /* npruntime_internal.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               1A569D110D7E2B82007C3983 /* npruntime_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE10D7E2B82007C3983 /* npruntime_priv.h */; };
+               1A569D120D7E2B82007C3983 /* objc_class.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE30D7E2B82007C3983 /* objc_class.h */; };
+               1A569D130D7E2B82007C3983 /* objc_class.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CE40D7E2B82007C3983 /* objc_class.mm */; };
+               1A569D140D7E2B82007C3983 /* objc_header.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE50D7E2B82007C3983 /* objc_header.h */; };
+               1A569D150D7E2B82007C3983 /* objc_instance.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE60D7E2B82007C3983 /* objc_instance.h */; };
+               1A569D160D7E2B82007C3983 /* objc_instance.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CE70D7E2B82007C3983 /* objc_instance.mm */; };
+               1A569D170D7E2B82007C3983 /* objc_runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CE80D7E2B82007C3983 /* objc_runtime.h */; };
+               1A569D180D7E2B82007C3983 /* objc_runtime.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CE90D7E2B82007C3983 /* objc_runtime.mm */; };
+               1A569D190D7E2B82007C3983 /* objc_utility.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CEA0D7E2B82007C3983 /* objc_utility.h */; };
+               1A569D1A0D7E2B82007C3983 /* objc_utility.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CEB0D7E2B82007C3983 /* objc_utility.mm */; };
+               1A569D1B0D7E2B82007C3983 /* WebScriptObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CEC0D7E2B82007C3983 /* WebScriptObject.h */; };
+               1A569D1C0D7E2B82007C3983 /* runtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CED0D7E2B82007C3983 /* runtime.cpp */; };
+               1A569D1D0D7E2B82007C3983 /* runtime.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CEE0D7E2B82007C3983 /* runtime.h */; };
+               1A569D1E0D7E2B82007C3983 /* runtime_array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CEF0D7E2B82007C3983 /* runtime_array.cpp */; };
+               1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF00D7E2B82007C3983 /* runtime_array.h */; };
+               1A569D200D7E2B82007C3983 /* runtime_method.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CF10D7E2B82007C3983 /* runtime_method.cpp */; };
+               1A569D210D7E2B82007C3983 /* runtime_method.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF20D7E2B82007C3983 /* runtime_method.h */; };
+               1A569D220D7E2B82007C3983 /* runtime_object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CF30D7E2B82007C3983 /* runtime_object.cpp */; };
+               1A569D230D7E2B82007C3983 /* runtime_object.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF40D7E2B82007C3983 /* runtime_object.h */; };
+               1A569D240D7E2B82007C3983 /* runtime_root.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A569CF50D7E2B82007C3983 /* runtime_root.cpp */; };
+               1A569D250D7E2B82007C3983 /* runtime_root.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A569CF60D7E2B82007C3983 /* runtime_root.h */; };
                1A6938010A11100A00C127FE /* TextDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6937FF0A11100A00C127FE /* TextDocument.cpp */; };
                1A6938020A11100A00C127FE /* TextDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6938000A11100A00C127FE /* TextDocument.h */; };
                1A750D5C0A90DEE1000FF215 /* JSTreeWalker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A750D5A0A90DEE1000FF215 /* JSTreeWalker.cpp */; };
                1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SharedBuffer.cpp; sourceTree = "<group>"; };
                1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SharedBuffer.h; sourceTree = "<group>"; };
                1A4A95510B4EDCFF002D8C3C /* SharedBufferMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedBufferMac.mm; sourceTree = "<group>"; };
+               1A569CC60D7E2B82007C3983 /* c_class.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_class.cpp; sourceTree = "<group>"; };
+               1A569CC70D7E2B82007C3983 /* c_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_class.h; sourceTree = "<group>"; };
+               1A569CC80D7E2B82007C3983 /* c_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_instance.cpp; sourceTree = "<group>"; };
+               1A569CC90D7E2B82007C3983 /* c_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_instance.h; sourceTree = "<group>"; };
+               1A569CCA0D7E2B82007C3983 /* c_runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_runtime.cpp; sourceTree = "<group>"; };
+               1A569CCB0D7E2B82007C3983 /* c_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_runtime.h; sourceTree = "<group>"; };
+               1A569CCC0D7E2B82007C3983 /* c_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = c_utility.cpp; sourceTree = "<group>"; };
+               1A569CCD0D7E2B82007C3983 /* c_utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = c_utility.h; sourceTree = "<group>"; };
+               1A569CCF0D7E2B82007C3983 /* jni_class.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_class.cpp; sourceTree = "<group>"; };
+               1A569CD00D7E2B82007C3983 /* jni_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_class.h; sourceTree = "<group>"; };
+               1A569CD10D7E2B82007C3983 /* jni_instance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_instance.cpp; sourceTree = "<group>"; };
+               1A569CD20D7E2B82007C3983 /* jni_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_instance.h; sourceTree = "<group>"; };
+               1A569CD30D7E2B82007C3983 /* jni_jsobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_jsobject.cpp; sourceTree = "<group>"; };
+               1A569CD40D7E2B82007C3983 /* jni_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_jsobject.h; sourceTree = "<group>"; };
+               1A569CD50D7E2B82007C3983 /* jni_objc.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = jni_objc.mm; sourceTree = "<group>"; };
+               1A569CD60D7E2B82007C3983 /* jni_runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_runtime.cpp; sourceTree = "<group>"; };
+               1A569CD70D7E2B82007C3983 /* jni_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_runtime.h; sourceTree = "<group>"; };
+               1A569CD80D7E2B82007C3983 /* jni_utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = jni_utility.cpp; sourceTree = "<group>"; };
+               1A569CD90D7E2B82007C3983 /* jni_utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jni_utility.h; sourceTree = "<group>"; };
+               1A569CDA0D7E2B82007C3983 /* NP_jsobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NP_jsobject.cpp; path = bridge/NP_jsobject.cpp; sourceTree = "<group>"; };
+               1A569CDB0D7E2B82007C3983 /* NP_jsobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NP_jsobject.h; path = bridge/NP_jsobject.h; sourceTree = "<group>"; };
+               1A569CDC0D7E2B82007C3983 /* npapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npapi.h; path = bridge/npapi.h; sourceTree = "<group>"; };
+               1A569CDD0D7E2B82007C3983 /* npruntime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = npruntime.cpp; path = bridge/npruntime.cpp; sourceTree = "<group>"; };
+               1A569CDE0D7E2B82007C3983 /* npruntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime.h; path = bridge/npruntime.h; sourceTree = "<group>"; };
+               1A569CDF0D7E2B82007C3983 /* npruntime_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_impl.h; path = bridge/npruntime_impl.h; sourceTree = "<group>"; };
+               1A569CE00D7E2B82007C3983 /* npruntime_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_internal.h; path = bridge/npruntime_internal.h; sourceTree = "<group>"; };
+               1A569CE10D7E2B82007C3983 /* npruntime_priv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npruntime_priv.h; path = bridge/npruntime_priv.h; sourceTree = "<group>"; };
+               1A569CE30D7E2B82007C3983 /* objc_class.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objc_class.h; sourceTree = "<group>"; };
+               1A569CE40D7E2B82007C3983 /* objc_class.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = objc_class.mm; sourceTree = "<group>"; };
+               1A569CE50D7E2B82007C3983 /* objc_header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objc_header.h; sourceTree = "<group>"; };
+               1A569CE60D7E2B82007C3983 /* objc_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objc_instance.h; sourceTree = "<group>"; };
+               1A569CE70D7E2B82007C3983 /* objc_instance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = objc_instance.mm; sourceTree = "<group>"; };
+               1A569CE80D7E2B82007C3983 /* objc_runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objc_runtime.h; sourceTree = "<group>"; };
+               1A569CE90D7E2B82007C3983 /* objc_runtime.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = objc_runtime.mm; sourceTree = "<group>"; };
+               1A569CEA0D7E2B82007C3983 /* objc_utility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objc_utility.h; sourceTree = "<group>"; };
+               1A569CEB0D7E2B82007C3983 /* objc_utility.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = objc_utility.mm; sourceTree = "<group>"; };
+               1A569CEC0D7E2B82007C3983 /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
+               1A569CED0D7E2B82007C3983 /* runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime.cpp; path = bridge/runtime.cpp; sourceTree = "<group>"; };
+               1A569CEE0D7E2B82007C3983 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime.h; path = bridge/runtime.h; sourceTree = "<group>"; };
+               1A569CEF0D7E2B82007C3983 /* runtime_array.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_array.cpp; path = bridge/runtime_array.cpp; sourceTree = "<group>"; };
+               1A569CF00D7E2B82007C3983 /* runtime_array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_array.h; path = bridge/runtime_array.h; sourceTree = "<group>"; };
+               1A569CF10D7E2B82007C3983 /* runtime_method.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_method.cpp; path = bridge/runtime_method.cpp; sourceTree = "<group>"; };
+               1A569CF20D7E2B82007C3983 /* runtime_method.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_method.h; path = bridge/runtime_method.h; sourceTree = "<group>"; };
+               1A569CF30D7E2B82007C3983 /* runtime_object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_object.cpp; path = bridge/runtime_object.cpp; sourceTree = "<group>"; };
+               1A569CF40D7E2B82007C3983 /* runtime_object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_object.h; path = bridge/runtime_object.h; sourceTree = "<group>"; };
+               1A569CF50D7E2B82007C3983 /* runtime_root.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = runtime_root.cpp; path = bridge/runtime_root.cpp; sourceTree = "<group>"; };
+               1A569CF60D7E2B82007C3983 /* runtime_root.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime_root.h; path = bridge/runtime_root.h; sourceTree = "<group>"; };
                1A6937FF0A11100A00C127FE /* TextDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextDocument.cpp; sourceTree = "<group>"; };
                1A6938000A11100A00C127FE /* TextDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextDocument.h; sourceTree = "<group>"; };
                1A750D3C0A90DE35000FF215 /* TreeWalker.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TreeWalker.idl; sourceTree = "<group>"; };
                                93F19B1908245E59001E9ABC /* Info.plist */,
                                F58EF58E02DFDFB7018635CA /* WebCore.base.exp */,
                                BC1A3790097C6F970019F3D8 /* bindings */,
+                               1A569CC40D7E2B60007C3983 /* bridge */,
                                F523D18402DE42E8018635CA /* css */,
                                F523D32402DE4478018635CA /* dom */,
                                93309D86099E64910056E581 /* editing */,
                        name = sql;
                        sourceTree = "<group>";
                };
+               1A569CC40D7E2B60007C3983 /* bridge */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A569CC50D7E2B82007C3983 /* c */,
+                               1A569CCE0D7E2B82007C3983 /* jni */,
+                               1A569CDA0D7E2B82007C3983 /* NP_jsobject.cpp */,
+                               1A569CDB0D7E2B82007C3983 /* NP_jsobject.h */,
+                               1A569CDC0D7E2B82007C3983 /* npapi.h */,
+                               1A569CDD0D7E2B82007C3983 /* npruntime.cpp */,
+                               1A569CDE0D7E2B82007C3983 /* npruntime.h */,
+                               1A569CDF0D7E2B82007C3983 /* npruntime_impl.h */,
+                               1A569CE00D7E2B82007C3983 /* npruntime_internal.h */,
+                               1A569CE10D7E2B82007C3983 /* npruntime_priv.h */,
+                               1A569CE20D7E2B82007C3983 /* objc */,
+                               1A569CED0D7E2B82007C3983 /* runtime.cpp */,
+                               1A569CEE0D7E2B82007C3983 /* runtime.h */,
+                               1A569CEF0D7E2B82007C3983 /* runtime_array.cpp */,
+                               1A569CF00D7E2B82007C3983 /* runtime_array.h */,
+                               1A569CF10D7E2B82007C3983 /* runtime_method.cpp */,
+                               1A569CF20D7E2B82007C3983 /* runtime_method.h */,
+                               1A569CF30D7E2B82007C3983 /* runtime_object.cpp */,
+                               1A569CF40D7E2B82007C3983 /* runtime_object.h */,
+                               1A569CF50D7E2B82007C3983 /* runtime_root.cpp */,
+                               1A569CF60D7E2B82007C3983 /* runtime_root.h */,
+                       );
+                       name = bridge;
+                       sourceTree = "<group>";
+               };
+               1A569CC50D7E2B82007C3983 /* c */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A569CC60D7E2B82007C3983 /* c_class.cpp */,
+                               1A569CC70D7E2B82007C3983 /* c_class.h */,
+                               1A569CC80D7E2B82007C3983 /* c_instance.cpp */,
+                               1A569CC90D7E2B82007C3983 /* c_instance.h */,
+                               1A569CCA0D7E2B82007C3983 /* c_runtime.cpp */,
+                               1A569CCB0D7E2B82007C3983 /* c_runtime.h */,
+                               1A569CCC0D7E2B82007C3983 /* c_utility.cpp */,
+                               1A569CCD0D7E2B82007C3983 /* c_utility.h */,
+                       );
+                       name = c;
+                       path = bridge/c;
+                       sourceTree = "<group>";
+               };
+               1A569CCE0D7E2B82007C3983 /* jni */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A569CCF0D7E2B82007C3983 /* jni_class.cpp */,
+                               1A569CD00D7E2B82007C3983 /* jni_class.h */,
+                               1A569CD10D7E2B82007C3983 /* jni_instance.cpp */,
+                               1A569CD20D7E2B82007C3983 /* jni_instance.h */,
+                               1A569CD30D7E2B82007C3983 /* jni_jsobject.cpp */,
+                               1A569CD40D7E2B82007C3983 /* jni_jsobject.h */,
+                               1A569CD50D7E2B82007C3983 /* jni_objc.mm */,
+                               1A569CD60D7E2B82007C3983 /* jni_runtime.cpp */,
+                               1A569CD70D7E2B82007C3983 /* jni_runtime.h */,
+                               1A569CD80D7E2B82007C3983 /* jni_utility.cpp */,
+                               1A569CD90D7E2B82007C3983 /* jni_utility.h */,
+                       );
+                       name = jni;
+                       path = bridge/jni;
+                       sourceTree = "<group>";
+               };
+               1A569CE20D7E2B82007C3983 /* objc */ = {
+                       isa = PBXGroup;
+                       children = (
+                               1A569CE30D7E2B82007C3983 /* objc_class.h */,
+                               1A569CE40D7E2B82007C3983 /* objc_class.mm */,
+                               1A569CE50D7E2B82007C3983 /* objc_header.h */,
+                               1A569CE60D7E2B82007C3983 /* objc_instance.h */,
+                               1A569CE70D7E2B82007C3983 /* objc_instance.mm */,
+                               1A569CE80D7E2B82007C3983 /* objc_runtime.h */,
+                               1A569CE90D7E2B82007C3983 /* objc_runtime.mm */,
+                               1A569CEA0D7E2B82007C3983 /* objc_utility.h */,
+                               1A569CEB0D7E2B82007C3983 /* objc_utility.mm */,
+                               1A569CEC0D7E2B82007C3983 /* WebScriptObject.h */,
+                       );
+                       name = objc;
+                       path = bridge/objc;
+                       sourceTree = "<group>";
+               };
                1AE42F670AA4B8CB00C8612D /* cf */ = {
                        isa = PBXGroup;
                        children = (
                                BC6C49F40D7DBA0500FFA558 /* JSImageConstructor.h in Headers */,
                                BC3452440D7E00EA0016574A /* JSRGBColor.h in Headers */,
                                BC3452560D7E02850016574A /* JSRGBColor.lut.h in Headers */,
+                               1A569CF80D7E2B82007C3983 /* c_class.h in Headers */,
+                               1A569CFA0D7E2B82007C3983 /* c_instance.h in Headers */,
+                               1A569CFC0D7E2B82007C3983 /* c_runtime.h in Headers */,
+                               1A569CFE0D7E2B82007C3983 /* c_utility.h in Headers */,
+                               1A569D000D7E2B82007C3983 /* jni_class.h in Headers */,
+                               1A569D020D7E2B82007C3983 /* jni_instance.h in Headers */,
+                               1A569D040D7E2B82007C3983 /* jni_jsobject.h in Headers */,
+                               1A569D070D7E2B82007C3983 /* jni_runtime.h in Headers */,
+                               1A569D090D7E2B82007C3983 /* jni_utility.h in Headers */,
+                               1A569D0B0D7E2B82007C3983 /* NP_jsobject.h in Headers */,
+                               1A569D0C0D7E2B82007C3983 /* npapi.h in Headers */,
+                               1A569D0E0D7E2B82007C3983 /* npruntime.h in Headers */,
+                               1A569D0F0D7E2B82007C3983 /* npruntime_impl.h in Headers */,
+                               1A569D100D7E2B82007C3983 /* npruntime_internal.h in Headers */,
+                               1A569D110D7E2B82007C3983 /* npruntime_priv.h in Headers */,
+                               1A569D120D7E2B82007C3983 /* objc_class.h in Headers */,
+                               1A569D140D7E2B82007C3983 /* objc_header.h in Headers */,
+                               1A569D150D7E2B82007C3983 /* objc_instance.h in Headers */,
+                               1A569D170D7E2B82007C3983 /* objc_runtime.h in Headers */,
+                               1A569D190D7E2B82007C3983 /* objc_utility.h in Headers */,
+                               1A569D1B0D7E2B82007C3983 /* WebScriptObject.h in Headers */,
+                               1A569D1D0D7E2B82007C3983 /* runtime.h in Headers */,
+                               1A569D1F0D7E2B82007C3983 /* runtime_array.h in Headers */,
+                               1A569D210D7E2B82007C3983 /* runtime_method.h in Headers */,
+                               1A569D230D7E2B82007C3983 /* runtime_object.h in Headers */,
+                               1A569D250D7E2B82007C3983 /* runtime_root.h in Headers */,
                                BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                                1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */,
                                1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */,
                                BC3452430D7E00EA0016574A /* JSRGBColor.cpp in Sources */,
+                               1A569CF70D7E2B82007C3983 /* c_class.cpp in Sources */,
+                               1A569CF90D7E2B82007C3983 /* c_instance.cpp in Sources */,
+                               1A569CFB0D7E2B82007C3983 /* c_runtime.cpp in Sources */,
+                               1A569CFD0D7E2B82007C3983 /* c_utility.cpp in Sources */,
+                               1A569CFF0D7E2B82007C3983 /* jni_class.cpp in Sources */,
+                               1A569D010D7E2B82007C3983 /* jni_instance.cpp in Sources */,
+                               1A569D030D7E2B82007C3983 /* jni_jsobject.cpp in Sources */,
+                               1A569D050D7E2B82007C3983 /* jni_objc.mm in Sources */,
+                               1A569D060D7E2B82007C3983 /* jni_runtime.cpp in Sources */,
+                               1A569D080D7E2B82007C3983 /* jni_utility.cpp in Sources */,
+                               1A569D0A0D7E2B82007C3983 /* NP_jsobject.cpp in Sources */,
+                               1A569D0D0D7E2B82007C3983 /* npruntime.cpp in Sources */,
+                               1A569D130D7E2B82007C3983 /* objc_class.mm in Sources */,
+                               1A569D160D7E2B82007C3983 /* objc_instance.mm in Sources */,
+                               1A569D180D7E2B82007C3983 /* objc_runtime.mm in Sources */,
+                               1A569D1A0D7E2B82007C3983 /* objc_utility.mm in Sources */,
+                               1A569D1C0D7E2B82007C3983 /* runtime.cpp in Sources */,
+                               1A569D1E0D7E2B82007C3983 /* runtime_array.cpp in Sources */,
+                               1A569D200D7E2B82007C3983 /* runtime_method.cpp in Sources */,
+                               1A569D220D7E2B82007C3983 /* runtime_object.cpp in Sources */,
+                               1A569D240D7E2B82007C3983 /* runtime_root.cpp in Sources */,
                                BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
index 6069b4b..b66d0b6 100644 (file)
@@ -29,7 +29,7 @@
 #include "HTMLPlugInElement.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+#include "runtime.h"
 #endif
 
 using namespace KJS;
index 892e049..f373d8e 100644 (file)
@@ -38,7 +38,7 @@
 #import "WebScriptObjectPrivate.h"
 #import "XPathEvaluator.h"
 #import "kjs_proxy.h"
-#import <bindings/runtime_root.h>
+#import "runtime_root.h"
 
 //------------------------------------------------------------------------------------------
 // Wrapping WebCore implementation objects
index 581a025..0745c4f 100644 (file)
@@ -53,7 +53,7 @@
 #import "JSXPathResult.h"
 #import "Node.h"
 #import "WebScriptObjectPrivate.h"
-#import <bindings/runtime_root.h>
+#import "runtime_root.h"
 #import <objc/objc-runtime.h>
 
 // This file makes use of both the ObjC DOM API and the C++ DOM API, so we need to be careful about what
index 8454f3d..dcd0259 100644 (file)
 #import <JavaScriptCore/APICast.h>
 #import <JavaScriptCore/JSGlobalObject.h>
 #import <JavaScriptCore/interpreter.h>
-#import <JavaScriptCore/objc_instance.h>
-#import <bindings/runtime_root.h>
-#import <bindings/runtime.h>
-#import <bindings/runtime_object.h>
+#import "objc_instance.h"
+#import "runtime_root.h"
+#import "runtime.h"
+#import "runtime_object.h"
 
 using namespace KJS;
 using namespace KJS::Bindings;
index 021a266..05f6a5d 100644 (file)
 
 #if PLATFORM(MAC)
 #define WTF_USE_JAVASCRIPTCORE_BINDINGS 1
+#define HAVE_JNI 1
 #ifdef __LP64__
 #define WTF_USE_NPOBJECT 0
 #else
index 63c59dd..ef9d618 100644 (file)
@@ -32,7 +32,7 @@
 #include "Settings.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+#include "runtime.h"
 #endif
 
 namespace WebCore {
index d4fba26..a3b2bf0 100644 (file)
@@ -34,7 +34,7 @@
 #include "RenderPartObject.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+#include "runtime.h"
 #endif
 
 namespace WebCore {
index 3fba40f..3745232 100644 (file)
@@ -43,7 +43,7 @@
 #include "Text.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+#include "runtime.h"
 #endif
 
 namespace WebCore {
index 955b76a..bcc4971 100644 (file)
 #include "kjs_proxy.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+#include "runtime.h"
 #endif
 
 #if USE(NPOBJECT)
-#include <bindings/NP_jsobject.h>
-#include <bindings/npruntime_impl.h>
-#include <bindings/runtime_root.h>
+#include "NP_jsobject.h"
+#include "npruntime_impl.h"
+#include "runtime_root.h"
 #endif
 
 using KJS::ExecState;
index 3d7ae06..e77958e 100644 (file)
@@ -68,9 +68,9 @@
 #include "TextIterator.h"
 #include "TextResourceDecoder.h"
 #include "XMLNames.h"
-#include "bindings/NP_jsobject.h"
-#include "bindings/npruntime_impl.h"
-#include "bindings/runtime_root.h"
+#include "NP_jsobject.h"
+#include "npruntime_impl.h"
+#include "runtime_root.h"
 #include "kjs_proxy.h"
 #include "visible_units.h"
 
index 1ae3576..cef8d1c 100644 (file)
 #import "visible_units.h"
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/APICast.h>
-#import <bindings/NP_jsobject.h>
-#import <bindings/npruntime_impl.h>
-#import <bindings/runtime_root.h>
-#import <bindings/runtime.h>
+#import "NP_jsobject.h"
+#import "npruntime_impl.h"
+#import "runtime_root.h"
+#import "runtime.h"
 
 @interface NSObject (WebPlugin)
 - (id)objectForWebScript;
index 00d9961..6741c4f 100644 (file)
@@ -90,8 +90,8 @@
 #import "visible_units.h"
 #import <JavaScriptCore/array_instance.h>
 #import <JavaScriptCore/date_object.h>
-#import <bindings/runtime_root.h>
-#import <bindings/runtime.h>
+#import "runtime_root.h"
+#import "runtime.h"
 #import <OpenScripting/ASRegistry.h>
 #import <wtf/RetainPtr.h>
 
index cfb3de6..06dc2de 100644 (file)
@@ -38,7 +38,7 @@
 #import <JavaScriptCore/debugger.h>
 #import <JavaScriptCore/function.h>
 #import <JavaScriptCore/interpreter.h>
-#import <bindings/runtime_root.h>
+#import "runtime_root.h"
 
 using namespace KJS;
 using namespace WebCore;
index 9b762c9..6aa603c 100644 (file)
@@ -57,7 +57,7 @@
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include "Settings.h"
-#include <bindings/runtime.h>
+#include "runtime.h"
 #include <kjs/JSLock.h>
 #include <kjs/value.h>
 #include <wtf/ASCIICType.h>
index 81994f2..0bdf5ae 100644 (file)
@@ -1,3 +1,12 @@
+2008-03-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+
+        Include file changes.
+        
+        * Plugins/WebBaseNetscapePluginView.mm:
+        * Plugins/WebNetscapePluginPackage.m:
+
 2008-03-04  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Darin Adler.
index 00a7b7d..53e4813 100644 (file)
@@ -54,7 +54,7 @@
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/Assertions.h>
 #import <JavaScriptCore/JSLock.h>
-#import <JavaScriptCore/npruntime_impl.h>
+#import <WebCore/npruntime_impl.h>
 #import <WebCore/Document.h>
 #import <WebCore/Element.h>
 #import <WebCore/Frame.h> 
index 297ff11..bf849a8 100644 (file)
@@ -33,7 +33,7 @@
 #import "WebKitNSStringExtras.h"
 #import "WebNSObjectExtras.h"
 #import "WebNetscapeDeprecatedFunctions.h"
-#import <JavaScriptCore/npruntime_impl.h>
+#import <WebCore/npruntime_impl.h>
 
 #ifdef SUPPORT_CFM
 typedef void (* FunctionPointer)(void);