JavaScriptCore:
authorggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Nov 2007 00:30:19 +0000 (00:30 +0000)
committerggaren@apple.com <ggaren@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 14 Nov 2007 00:30:19 +0000 (00:30 +0000)
        Reviewed by Sam Weinig.

        Moved Shared.h into wtf so it could be used in more places. Deployed
        Shared in places where JSCore previously had hand-rolled ref-counting
        classes.

        * API/JSClassRef.cpp:
        (OpaqueJSClass::OpaqueJSClass):
        * API/JSClassRef.h:
        * API/JSObjectRef.cpp:
        (JSClassRetain):
        (JSClassRelease):
        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
        * JavaScriptCore.xcodeproj/project.pbxproj:
        * kjs/interpreter.cpp:
        (KJS::Interpreter::init):
        * kjs/interpreter.h:
        * kjs/regexp.cpp:
        (KJS::RegExp::RegExp):
        * kjs/regexp.h:
        * wtf/Shared.h: Copied from WebCore/platform/Shared.h.

JavaScriptGlue:

        Reviewed by Sam Weinig.

        Moved Shared.h into wtf so it could be used in more places.

        * ForwardingHeaders/wtf/Shared.h: Added.

WebCore:

        Reviewed by Sam Weinig.

        Moved Shared.h into wtf so it could be used in more places. Retained
        TreeShared, but moved it to its own file, TreeShared.h.

        * ForwardingHeaders/wtf/Shared.h: Added.
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/js/JSSVGPODTypeWrapper.h:
        * css/CSSFontFace.h:
        * css/CSSRuleList.h:
        * css/Counter.h:
        * css/Pair.h:
        * css/Rect.h:
        * css/StyleBase.h:
        * css/StyleSheetList.h:
        * dom/Clipboard.h:
        * dom/DOMImplementation.h:
        * dom/Event.h:
        * dom/EventListener.h:
        * dom/NamedNodeMap.h:
        * dom/NodeFilterCondition.h:
        * dom/NodeList.h:
        * dom/Range.h:
        * dom/RangeException.h:
        * dom/RegisteredEventListener.h:
        * dom/Traversal.h:
        * history/BackForwardList.h:
        * history/CachedPage.h:
        * history/HistoryItem.h:
        * html/CanvasGradient.h:
        * html/CanvasPattern.h:
        * html/HTMLCollection.h:
        * html/MediaError.h:
        * html/TimeRanges.h:
        * html/VoidCallback.h:
        * ksvg2/css/SVGRenderStyleDefs.h:
        * ksvg2/svg/SVGAnimatedTemplate.h:
        * ksvg2/svg/SVGElementInstanceList.h:
        * ksvg2/svg/SVGList.h:
        * ksvg2/svg/SVGPathSeg.h:
        * ksvg2/svg/SVGPreserveAspectRatio.h:
        * ksvg2/svg/SVGRenderingIntent.h:
        * ksvg2/svg/SVGTransform.h:
        * ksvg2/svg/SVGUnitTypes.h:
        * loader/DocumentLoader.h:
        * loader/FormState.h:
        * loader/ResourceLoader.h:
        * loader/TextResourceDecoder.h:
        * loader/icon/IconRecord.h:
        * page/BarInfo.h:
        * page/Console.h:
        * page/DOMSelection.h:
        * page/DOMWindow.h:
        * page/History.h:
        * page/InspectorController.cpp:
        * page/Plugin.h:
        * page/Screen.h:
        * platform/ArrayImpl.h:
        * platform/CString.h:
        * platform/DeprecatedValueListImpl.cpp:
        * platform/FontFallbackList.h:
        * platform/FontFamily.h:
        * platform/FontSelector.h:
        * platform/GlyphPageTreeNode.h:
        * platform/PopupMenu.h:
        * platform/RegularExpression.cpp:
        * platform/ScrollBar.h:
        * platform/Shared.h: Removed.
        * platform/SharedBuffer.h:
        * platform/StringImpl.h:
        * platform/graphics/Icon.h:
        * platform/graphics/svg/SVGResource.h:
        * platform/network/FormData.h:
        * platform/network/ResourceHandleClient.h:
        * rendering/RenderStyle.h:
        * rendering/SVGCharacterLayoutInfo.h:
        * storage/SQLResultSetRowList.h:
        * xml/DOMParser.h:
        * xml/XMLSerializer.h:
        * xml/XPathEvaluator.h:
        * xml/XPathExpression.h:
        * xml/XPathNSResolver.h:
        * xml/XPathResult.h:

WebKit/mac:

        Reviewed by Sam Weinig.

        Moved Shared.h into wtf so it could be used in more places.

        * ChangeLog:
        * WebCoreSupport/WebContextMenuClient.h:

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

97 files changed:
JavaScriptCore/API/JSClassRef.cpp
JavaScriptCore/API/JSClassRef.h
JavaScriptCore/API/JSObjectRef.cpp
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
JavaScriptCore/kjs/interpreter.cpp
JavaScriptCore/kjs/interpreter.h
JavaScriptCore/kjs/regexp.cpp
JavaScriptCore/kjs/regexp.h
JavaScriptCore/wtf/Shared.h [new file with mode: 0644]
JavaScriptGlue/ChangeLog
JavaScriptGlue/ForwardingHeaders/wtf/Shared.h [new file with mode: 0644]
WebCore/ChangeLog
WebCore/ForwardingHeaders/wtf/Shared.h [new file with mode: 0644]
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/bindings/js/JSSVGPODTypeWrapper.h
WebCore/css/CSSFontFace.h
WebCore/css/CSSRuleList.h
WebCore/css/Counter.h
WebCore/css/Pair.h
WebCore/css/Rect.h
WebCore/css/StyleBase.h
WebCore/css/StyleSheetList.h
WebCore/dom/Clipboard.h
WebCore/dom/DOMImplementation.h
WebCore/dom/Event.h
WebCore/dom/EventListener.h
WebCore/dom/NamedNodeMap.h
WebCore/dom/Node.h
WebCore/dom/NodeFilterCondition.h
WebCore/dom/NodeList.h
WebCore/dom/Range.h
WebCore/dom/RangeException.h
WebCore/dom/RegisteredEventListener.h
WebCore/dom/Traversal.h
WebCore/history/BackForwardList.h
WebCore/history/CachedPage.h
WebCore/history/HistoryItem.h
WebCore/html/CanvasGradient.h
WebCore/html/CanvasPattern.h
WebCore/html/HTMLCollection.h
WebCore/html/MediaError.h
WebCore/html/TimeRanges.h
WebCore/html/VoidCallback.h
WebCore/ksvg2/css/SVGRenderStyleDefs.h
WebCore/ksvg2/svg/SVGAnimatedTemplate.h
WebCore/ksvg2/svg/SVGElementInstanceList.h
WebCore/ksvg2/svg/SVGList.h
WebCore/ksvg2/svg/SVGPathSeg.h
WebCore/ksvg2/svg/SVGPreserveAspectRatio.h
WebCore/ksvg2/svg/SVGRenderingIntent.h
WebCore/ksvg2/svg/SVGTransform.h
WebCore/ksvg2/svg/SVGUnitTypes.h
WebCore/loader/DocumentLoader.h
WebCore/loader/FormState.h
WebCore/loader/ResourceLoader.h
WebCore/loader/TextResourceDecoder.h
WebCore/loader/icon/IconRecord.h
WebCore/page/BarInfo.h
WebCore/page/Console.h
WebCore/page/DOMSelection.h
WebCore/page/DOMWindow.h
WebCore/page/History.h
WebCore/page/InspectorController.cpp
WebCore/page/Plugin.h
WebCore/page/Screen.h
WebCore/platform/ArrayImpl.h
WebCore/platform/CString.h
WebCore/platform/DeprecatedValueListImpl.cpp
WebCore/platform/FontFallbackList.h
WebCore/platform/FontFamily.h
WebCore/platform/FontSelector.h
WebCore/platform/GlyphPageTreeNode.h
WebCore/platform/PopupMenu.h
WebCore/platform/RegularExpression.cpp
WebCore/platform/ScrollBar.h
WebCore/platform/SharedBuffer.h
WebCore/platform/StringImpl.h
WebCore/platform/TreeShared.h [moved from WebCore/platform/Shared.h with 76% similarity]
WebCore/platform/graphics/Icon.h
WebCore/platform/graphics/svg/SVGResource.h
WebCore/platform/network/FormData.h
WebCore/platform/network/ResourceHandleClient.h
WebCore/rendering/RenderStyle.h
WebCore/rendering/SVGCharacterLayoutInfo.h
WebCore/storage/SQLResultSetRowList.h
WebCore/xml/DOMParser.h
WebCore/xml/XMLSerializer.h
WebCore/xml/XPathEvaluator.h
WebCore/xml/XPathExpression.h
WebCore/xml/XPathNSResolver.h
WebCore/xml/XPathResult.h
WebKit/mac/ChangeLog
WebKit/mac/ForwardingHeaders/wtf/Shared.h [new file with mode: 0644]
WebKit/mac/WebCoreSupport/WebContextMenuClient.h

index fcde8b214682636d8d1c231a3001e6a7f86c46fa..f82c769f57f569a11be2b99c7e4f0e47edb29819 100644 (file)
@@ -37,9 +37,8 @@ using namespace KJS;
 const JSClassDefinition kJSClassDefinitionEmpty = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 OpaqueJSClass::OpaqueJSClass(const JSClassDefinition* definition, OpaqueJSClass* protoClass) 
-    : refCount(0)
     // FIXME: <rdar://problem/4949018>
-    , className(definition->className)
+    : className(definition->className)
     , parentClass(definition->parentClass)
     , prototypeClass(0)
     , staticValues(0)
index 15b7ab3e72826f35f35fff2ed71ed5c6ac139a36..6a365bedbb88c6e9f9694db683b25b7ebb9e805f 100644 (file)
@@ -55,7 +55,7 @@ struct StaticFunctionEntry {
     JSPropertyAttributes attributes;
 };
 
-struct OpaqueJSClass {
+struct OpaqueJSClass : public Shared<OpaqueJSClass> {
     static OpaqueJSClass* create(const JSClassDefinition*);
     static OpaqueJSClass* createNoAutomaticPrototype(const JSClassDefinition*);
     ~OpaqueJSClass();
@@ -65,8 +65,6 @@ struct OpaqueJSClass {
     typedef HashMap<RefPtr<KJS::UString::Rep>, StaticValueEntry*> StaticValuesTable;
     typedef HashMap<RefPtr<KJS::UString::Rep>, StaticFunctionEntry*> StaticFunctionsTable;
 
-    unsigned refCount;
-
     KJS::UString className;
     OpaqueJSClass* parentClass;
     OpaqueJSClass* prototypeClass;
index 0adb5fe1c8adb89022cac63214beba042d626030..f65cafc2c02d8dbeb37c0f7ea0399fedd971bc39 100644 (file)
@@ -57,15 +57,14 @@ JSClassRef JSClassCreate(const JSClassDefinition* definition)
 JSClassRef JSClassRetain(JSClassRef jsClass)
 {
     JSLock lock;
-    ++jsClass->refCount;
+    jsClass->ref();
     return jsClass;
 }
 
 void JSClassRelease(JSClassRef jsClass)
 {
     JSLock lock;
-    if (--jsClass->refCount == 0)
-        delete jsClass;
+    jsClass->deref();
 }
 
 JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
index 52eb6121fdc5d228ae6daa5fccb14a52d69f5c45..6bc3dfb840f93d6f05d50c4695c8f8be2f166795 100644 (file)
@@ -1,3 +1,27 @@
+2007-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Moved Shared.h into wtf so it could be used in more places. Deployed
+        Shared in places where JSCore previously had hand-rolled ref-counting
+        classes.
+
+        * API/JSClassRef.cpp:
+        (OpaqueJSClass::OpaqueJSClass):
+        * API/JSClassRef.h:
+        * API/JSObjectRef.cpp:
+        (JSClassRetain):
+        (JSClassRelease):
+        * JavaScriptCore.vcproj/WTF/WTF.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * kjs/interpreter.cpp:
+        (KJS::Interpreter::init):
+        * kjs/interpreter.h:
+        * kjs/regexp.cpp:
+        (KJS::RegExp::RegExp):
+        * kjs/regexp.h:
+        * wtf/Shared.h: Copied from WebCore/platform/Shared.h.
+
 2007-11-13  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Maciej.
index b35a6e91e21d7a9d0785a5565b217ab9f603714f..de1c7c781cafd2996bc55f6fd462443d3e78c12f 100644 (file)
                        RelativePath="..\..\wtf\RetainPtr.h"\r
                        >\r
                </File>\r
+               <File\r
+                       RelativePath="..\..\wtf\Shared.h"\r
+                       >\r
+               </File>\r
                <File\r
                        RelativePath="..\..\wtf\StringExtras.h"\r
                        >\r
index 4fb511299e20bf5f59a556e3650449d8c88724e1..b07b3d6e63e65b111f0c37e73129f766c69fdf0a 100644 (file)
@@ -38,6 +38,7 @@
 /* Begin PBXBuildFile section */
                141211310A48794D00480255 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 932F5BD90822A1C700736975 /* JavaScriptCore.framework */; };
                141211340A48795800480255 /* minidom.c in Sources */ = {isa = PBXBuildFile; fileRef = 141211020A48780900480255 /* minidom.c */; };
+               1419D2010CEA4D0D00FF507A /* Shared.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D1030CEA472C00FF507A /* Shared.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1421359B0A677F4F00A8195E /* JSBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1421359A0A677F4F00A8195E /* JSBase.cpp */; };
                142711390A460BBB0080EEEA /* JSBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 142711380A460BBB0080EEEA /* JSBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
                143A97E60A4A06E200456B66 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
                141211020A48780900480255 /* minidom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = minidom.c; sourceTree = "<group>"; };
                1412110D0A48788700480255 /* minidom.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = minidom.js; sourceTree = "<group>"; };
                141211200A48793C00480255 /* minidom */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = minidom; sourceTree = BUILT_PRODUCTS_DIR; };
+               1419D1030CEA472C00FF507A /* Shared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shared.h; sourceTree = "<group>"; };
                1421359A0A677F4F00A8195E /* JSBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBase.cpp; sourceTree = "<group>"; };
-               142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSBase.h; sourceTree = "<group>"; };
+               142711380A460BBB0080EEEA /* JSBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSBase.h; path = ../API/JSBase.h; sourceTree = "<group>"; };
                1440051F0A531D3B0005F061 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Node.h; sourceTree = "<group>"; };
                144005200A531D3B0005F061 /* Node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Node.c; sourceTree = "<group>"; };
                144007480A536CC20005F061 /* NodeList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeList.h; sourceTree = "<group>"; };
                144007560A5370D20005F061 /* JSNodeList.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = JSNodeList.c; sourceTree = "<group>"; };
                1440F6410A4F8B6A0005F061 /* JSNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNode.h; sourceTree = "<group>"; };
                1440F6420A4F8B6A0005F061 /* JSNode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = JSNode.c; sourceTree = "<group>"; };
-               1440F88F0A508B100005F061 /* JSCallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackFunction.h; sourceTree = "<group>"; };
+               1440F88F0A508B100005F061 /* JSCallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSCallbackFunction.h; path = ../API/JSCallbackFunction.h; sourceTree = "<group>"; };
                1440F8900A508B100005F061 /* JSCallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackFunction.cpp; sourceTree = "<group>"; };
-               1440F8AC0A508D200005F061 /* JSCallbackConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackConstructor.h; sourceTree = "<group>"; };
+               1440F8AC0A508D200005F061 /* JSCallbackConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSCallbackConstructor.h; path = ../API/JSCallbackConstructor.h; sourceTree = "<group>"; };
                1440F8AD0A508D200005F061 /* JSCallbackConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackConstructor.cpp; sourceTree = "<group>"; };
-               1440FCE10A51E46B0005F061 /* JSClassRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSClassRef.h; sourceTree = "<group>"; };
+               1440FCE10A51E46B0005F061 /* JSClassRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSClassRef.h; path = ../API/JSClassRef.h; sourceTree = "<group>"; };
                1440FCE20A51E46B0005F061 /* JSClassRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSClassRef.cpp; sourceTree = "<group>"; };
-               146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSStringRefCF.h; sourceTree = "<group>"; };
+               146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JSStringRefCF.h; path = ../API/JSStringRefCF.h; sourceTree = "<group>"; };
                146AAB370B66A94400E55F16 /* JSStringRefCF.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringRefCF.cpp; sourceTree = "<group>"; };
                14760863099C633800437128 /* JSImmediate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImmediate.cpp; sourceTree = "<group>"; };
-               1482B6EA0A4300B300517CFC /* JSValueRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueRef.h; sourceTree = "<group>"; };
-               1482B74B0A43032800517CFC /* JSStringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringRef.h; sourceTree = "<group>"; };
+               1482B6EA0A4300B300517CFC /* JSValueRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSValueRef.h; path = ../API/JSValueRef.h; sourceTree = "<group>"; };
+               1482B74B0A43032800517CFC /* JSStringRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSStringRef.h; path = ../API/JSStringRef.h; sourceTree = "<group>"; };
                1482B74C0A43032800517CFC /* JSStringRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringRef.cpp; sourceTree = "<group>"; };
-               1482B78A0A4305AB00517CFC /* APICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICast.h; sourceTree = "<group>"; };
-               1482B7E10A43076000517CFC /* JSObjectRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSObjectRef.h; sourceTree = "<group>"; };
+               1482B78A0A4305AB00517CFC /* APICast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APICast.h; path = ../API/APICast.h; sourceTree = "<group>"; };
+               1482B7E10A43076000517CFC /* JSObjectRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSObjectRef.h; path = ../API/JSObjectRef.h; sourceTree = "<group>"; };
                1482B7E20A43076000517CFC /* JSObjectRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSObjectRef.cpp; sourceTree = "<group>"; };
-               1483B589099BC1950016E4F0 /* JSImmediate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSImmediate.h; sourceTree = "<group>"; };
+               1483B589099BC1950016E4F0 /* JSImmediate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JSImmediate.h; path = ../kjs/JSImmediate.h; sourceTree = "<group>"; };
                148A1626095D16BB00666D0D /* ListRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ListRefPtr.h; sourceTree = "<group>"; };
-               14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SymbolTable.h; sourceTree = "<group>"; };
-               14ABB36E099C076400E2A24F /* value.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = value.h; sourceTree = "<group>"; };
-               14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSType.h; sourceTree = "<group>"; };
-               14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObject.h; sourceTree = "<group>"; };
+               14A396A60CD2933100B5B4FF /* SymbolTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SymbolTable.h; path = ../kjs/SymbolTable.h; sourceTree = "<group>"; };
+               14ABB36E099C076400E2A24F /* value.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = value.h; path = ../kjs/value.h; sourceTree = "<group>"; };
+               14ABB454099C2A0F00E2A24F /* JSType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSType.h; path = ../kjs/JSType.h; sourceTree = "<group>"; };
+               14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSCallbackObject.h; path = ../API/JSCallbackObject.h; sourceTree = "<group>"; };
                14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackObject.cpp; sourceTree = "<group>"; };
                14B8ECA60A5653980062BE54 /* JavaScriptCore.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = JavaScriptCore.exp; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
-               14BD534A0A3E0AEA00BAF59C /* SavedBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SavedBuiltins.h; sourceTree = "<group>"; };
-               14BD53F30A3E12D800BAF59C /* ExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExecState.h; sourceTree = "<group>"; };
+               14BD534A0A3E0AEA00BAF59C /* SavedBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SavedBuiltins.h; path = ../kjs/SavedBuiltins.h; sourceTree = "<group>"; };
+               14BD53F30A3E12D800BAF59C /* ExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExecState.h; path = ../kjs/ExecState.h; sourceTree = "<group>"; };
                14BD53F40A3E12D800BAF59C /* ExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecState.cpp; sourceTree = "<group>"; };
                14BD59BF0A3E8F9000BAF59C /* testapi */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testapi; sourceTree = BUILT_PRODUCTS_DIR; };
                14BD5A290A3E91F600BAF59C /* JSContextRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSContextRef.cpp; sourceTree = "<group>"; };
-               14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSContextRef.h; sourceTree = "<group>"; };
+               14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JSContextRef.h; path = ../API/JSContextRef.h; sourceTree = "<group>"; };
                14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSValueRef.cpp; sourceTree = "<group>"; };
                14BD5A2D0A3E91F600BAF59C /* testapi.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testapi.c; sourceTree = "<group>"; };
-               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
+               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JavaScriptCore.h; path = ../API/JavaScriptCore.h; sourceTree = "<group>"; };
                14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = testapi.js; sourceTree = "<group>"; };
                1C9051420BA9E8A70081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
                1C9051430BA9E8A70081E9D0 /* JavaScriptCore.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = JavaScriptCore.xcconfig; sourceTree = "<group>"; };
                1C9051440BA9E8A70081E9D0 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
                1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
-               1CAF34880A6C421700ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebScriptObject.h; path = bindings/objc/WebScriptObject.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 = 2; lastKnownFileType = sourcecode.cpp.cpp; name = testkjs.cpp; path = ../kjs/testkjs.cpp; sourceTree = "<group>"; tabWidth = 8; };
                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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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; };
+               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>"; };
                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>"; };
+               5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CollectorHeapIntrospector.h; path = ../kjs/CollectorHeapIntrospector.h; sourceTree = "<group>"; };
                5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocZoneSupport.h; sourceTree = "<group>"; };
                651F6412039D5B5F0078395C /* dtoa.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dtoa.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = dtoa.h; sourceTree = "<group>"; tabWidth = 8; };
+               651F6413039D5B5F0078395C /* dtoa.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = dtoa.h; path = ../kjs/dtoa.h; sourceTree = "<group>"; tabWidth = 8; };
                652246A40C8D7A0E007BDAF7 /* HashIterators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HashIterators.h; sourceTree = "<group>"; };
                65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PropertyNameArray.cpp; sourceTree = "<group>"; };
-               65400C100A69BAF200509887 /* PropertyNameArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PropertyNameArray.h; sourceTree = "<group>"; };
+               65400C100A69BAF200509887 /* PropertyNameArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PropertyNameArray.h; path = ../kjs/PropertyNameArray.h; sourceTree = "<group>"; };
                6541720E039E08B90058BFEB /* dftables.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dftables.cpp; path = pcre/dftables.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               6541720F039E08B90058BFEB /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = pcre.h; path = pcre/pcre.h; sourceTree = "<group>"; tabWidth = 8; };
+               6541720F039E08B90058BFEB /* pcre.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = pcre.h; path = ../pcre/pcre.h; sourceTree = "<group>"; tabWidth = 8; };
                6541BD6E08E80A17002CBEE7 /* TCPageMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TCPageMap.h; sourceTree = "<group>"; tabWidth = 8; };
                6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = TCSpinLock.h; sourceTree = "<group>"; tabWidth = 8; };
                6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TCSystemAlloc.cpp; sourceTree = "<group>"; tabWidth = 8; };
                6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
                6560A63D04B3B69F008AE952 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
                65621E6B089E859700760F35 /* property_slot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property_slot.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               65621E6C089E859700760F35 /* property_slot.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = property_slot.h; sourceTree = "<group>"; tabWidth = 8; };
+               65621E6C089E859700760F35 /* property_slot.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = property_slot.h; path = ../kjs/property_slot.h; sourceTree = "<group>"; tabWidth = 8; };
                657EB7450B708F540063461B /* ListHashSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ListHashSet.h; sourceTree = "<group>"; };
                657EEBBF094E445E008C9C7B /* HashCountedSet.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashCountedSet.h; sourceTree = "<group>"; tabWidth = 8; };
                6580F795094070560082C219 /* PassRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = PassRefPtr.h; sourceTree = "<group>"; tabWidth = 8; };
                659126BC0BDD1728001921FB /* AllInOneFile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AllInOneFile.cpp; sourceTree = "<group>"; };
                6592C316098B7DE10003D4F6 /* Vector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Vector.h; sourceTree = "<group>"; };
                6592C317098B7DE10003D4F6 /* VectorTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VectorTraits.h; sourceTree = "<group>"; };
-               65B1749909D0FEB700820339 /* array_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = array_object.lut.h; sourceTree = "<group>"; };
+               65B1749909D0FEB700820339 /* array_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = array_object.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/array_object.lut.h; sourceTree = "<group>"; };
                65B174BE09D1000200820339 /* chartables.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = chartables.c; sourceTree = "<group>"; };
-               65B174F109D100FA00820339 /* math_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math_object.lut.h; sourceTree = "<group>"; };
-               65B174F209D100FA00820339 /* number_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = number_object.lut.h; sourceTree = "<group>"; };
-               65B174F409D100FA00820339 /* string_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = string_object.lut.h; sourceTree = "<group>"; };
-               65B813A80CD1D01900DF59D6 /* LabelStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LabelStack.h; sourceTree = "<group>"; };
-               65C02FBB0637462A003E7EE6 /* protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = protect.h; sourceTree = "<group>"; tabWidth = 8; };
+               65B174F109D100FA00820339 /* math_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = math_object.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/math_object.lut.h; sourceTree = "<group>"; };
+               65B174F209D100FA00820339 /* number_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = number_object.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/number_object.lut.h; sourceTree = "<group>"; };
+               65B174F409D100FA00820339 /* string_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = string_object.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/string_object.lut.h; sourceTree = "<group>"; };
+               65B813A80CD1D01900DF59D6 /* LabelStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LabelStack.h; path = ../kjs/LabelStack.h; sourceTree = "<group>"; };
+               65C02FBB0637462A003E7EE6 /* protect.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = protect.h; path = ../kjs/protect.h; sourceTree = "<group>"; tabWidth = 8; };
                65C647B3093EF8D60022C380 /* RefPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RefPtr.h; sourceTree = "<group>"; tabWidth = 8; };
                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapperObject.cpp; sourceTree = "<group>"; };
-               65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSWrapperObject.h; sourceTree = "<group>"; };
+               65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JSWrapperObject.h; path = ../kjs/JSWrapperObject.h; sourceTree = "<group>"; };
                65D6D87E09B5A32E0002E4D7 /* Platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Platform.h; sourceTree = "<group>"; };
                65DFC92A08EA173A00F7300B /* HashFunctions.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashFunctions.h; sourceTree = "<group>"; tabWidth = 8; };
                65DFC92B08EA173A00F7300B /* HashMap.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = HashMap.h; sourceTree = "<group>"; tabWidth = 8; };
                65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastMalloc.cpp; sourceTree = "<group>"; tabWidth = 8; };
                65E217BA08E7EECC0023E5F6 /* FastMalloc.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = FastMalloc.h; sourceTree = "<group>"; tabWidth = 8; };
                65EA4C99092AF9E20093D800 /* JSLock.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSLock.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               65EA4C9A092AF9E20093D800 /* JSLock.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = JSLock.h; sourceTree = "<group>"; tabWidth = 8; };
+               65EA4C9A092AF9E20093D800 /* JSLock.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = JSLock.h; path = ../kjs/JSLock.h; sourceTree = "<group>"; tabWidth = 8; };
                65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CommonIdentifiers.cpp; sourceTree = "<group>"; };
-               65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommonIdentifiers.h; sourceTree = "<group>"; };
-               65F340840CD6C0DE00C0CA8B /* LocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorage.h; sourceTree = "<group>"; };
-               65FB3EB209D109F000F49DEB /* lexer.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lexer.lut.h; sourceTree = "<group>"; };
-               65FB3F4709D11B2400F49DEB /* date_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = date_object.lut.h; sourceTree = "<group>"; };
+               65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CommonIdentifiers.h; path = ../kjs/CommonIdentifiers.h; sourceTree = "<group>"; };
+               65F340840CD6C0DE00C0CA8B /* LocalStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LocalStorage.h; path = ../kjs/LocalStorage.h; sourceTree = "<group>"; };
+               65FB3EB209D109F000F49DEB /* lexer.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = lexer.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/lexer.lut.h; sourceTree = "<group>"; };
+               65FB3F4709D11B2400F49DEB /* date_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = date_object.lut.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/date_object.lut.h; sourceTree = "<group>"; };
                65FB3F4809D11B2400F49DEB /* grammar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = grammar.cpp; sourceTree = "<group>"; };
-               65FB3F4909D11B2400F49DEB /* grammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = grammar.h; sourceTree = "<group>"; };
-               65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = 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; };
+               65FB3F4909D11B2400F49DEB /* grammar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = grammar.h; path = ../../../../symroots/Debug/DerivedSources/JavaScriptCore/grammar.h; sourceTree = "<group>"; };
+               65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; 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; name = bool_object.h; path = ../kjs/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; };
+               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; };
-               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; };
+               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; };
+               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>"; };
                930754BF08B0F68000AB3056 /* pcre_compile.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_compile.cpp; path = pcre/pcre_compile.cpp; sourceTree = "<group>"; tabWidth = 8; };
                930754CE08B0F74500AB3056 /* pcre_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_tables.cpp; path = pcre/pcre_tables.cpp; sourceTree = "<group>"; tabWidth = 8; };
                930754E908B0F78500AB3056 /* pcre_exec.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_exec.cpp; path = pcre/pcre_exec.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               931C6CEF038EE8DE008635CE /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = list.h; sourceTree = "<group>"; tabWidth = 8; };
+               931C6CEF038EE8DE008635CE /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = ../kjs/list.h; sourceTree = "<group>"; tabWidth = 8; };
                931C6CF0038EE8DE008635CE /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = list.cpp; sourceTree = "<group>"; tabWidth = 8; };
                9322A00306C341D3009067BB /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
                932F5BD80822A1C700736975 /* Info.plist */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; tabWidth = 8; usesTabs = 1; };
                932F5BD90822A1C700736975 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                932F5BE10822A1C700736975 /* testkjs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testkjs; sourceTree = BUILT_PRODUCTS_DIR; };
                933A3499038AE7C6008635CE /* grammar.y */ = {isa = PBXFileReference; explicitFileType = sourcecode.yacc; fileEncoding = 4; indentWidth = 4; path = grammar.y; sourceTree = "<group>"; tabWidth = 8; };
-               933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = identifier.h; sourceTree = "<group>"; tabWidth = 8; };
+               933A349A038AE7C6008635CE /* identifier.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = identifier.h; path = ../kjs/identifier.h; sourceTree = "<group>"; tabWidth = 8; };
                933A349D038AE80F008635CE /* identifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = identifier.cpp; sourceTree = "<group>"; tabWidth = 8; };
                935AF46909E9D9DB00ACD1D8 /* Forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Forward.h; sourceTree = "<group>"; };
                935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnusedParam.h; sourceTree = "<group>"; };
                935F69F608244FEA003D1A45 /* dftables */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dftables; sourceTree = BUILT_PRODUCTS_DIR; };
                9364B273045B7D6C00A9CAC1 /* fpconst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fpconst.cpp; sourceTree = "<group>"; tabWidth = 8; };
                937013470CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_ucp_searchfuncs.cpp; path = pcre/pcre_ucp_searchfuncs.cpp; sourceTree = "<group>"; };
-               9374D3A7038D9D74008635CE /* scope_chain.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = scope_chain.h; sourceTree = "<group>"; tabWidth = 8; };
+               9374D3A7038D9D74008635CE /* scope_chain.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = scope_chain.h; path = ../kjs/scope_chain.h; sourceTree = "<group>"; tabWidth = 8; };
                9374D3A8038D9D74008635CE /* scope_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scope_chain.cpp; sourceTree = "<group>"; tabWidth = 8; };
                937B63CC09E766D200A671DD /* DerivedSources.make */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = DerivedSources.make; sourceTree = "<group>"; usesTabs = 1; };
-               938772E5038BFE19008635CE /* array_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = array_instance.h; sourceTree = "<group>"; tabWidth = 8; };
+               938772E5038BFE19008635CE /* array_instance.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = array_instance.h; path = ../kjs/array_instance.h; sourceTree = "<group>"; tabWidth = 8; };
                938C4F690CA06BC700D9310A /* ASCIICType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCIICType.h; sourceTree = "<group>"; };
                938C4F6B0CA06BCE00D9310A /* DisallowCType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DisallowCType.h; sourceTree = "<group>"; };
                93AA4F770957251F0084B3A7 /* AlwaysInline.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = AlwaysInline.h; sourceTree = "<group>"; tabWidth = 8; };
                93B6A0DE0AA64DA40076DE27 /* GetPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GetPtr.h; sourceTree = "<group>"; };
                93E26BC908B1511900F85226 /* pcre_ord2utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_ord2utf8.cpp; path = pcre/pcre_ord2utf8.cpp; sourceTree = "<group>"; tabWidth = 8; };
                93E26BD308B1514100F85226 /* pcre_xclass.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pcre_xclass.cpp; path = pcre/pcre_xclass.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               93E26BE508B1517100F85226 /* pcre_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = pcre_internal.h; path = pcre/pcre_internal.h; sourceTree = "<group>"; tabWidth = 8; };
-               93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = ucpinternal.h; path = pcre/ucpinternal.h; sourceTree = "<group>"; tabWidth = 8; };
+               93E26BE508B1517100F85226 /* pcre_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = pcre_internal.h; path = ../pcre/pcre_internal.h; sourceTree = "<group>"; tabWidth = 8; };
+               93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = ucpinternal.h; path = ../pcre/ucpinternal.h; sourceTree = "<group>"; tabWidth = 8; };
                93F0B3A909BB4DC00068FCE3 /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Parser.cpp; sourceTree = "<group>"; };
-               93F0B3AA09BB4DC00068FCE3 /* Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Parser.h; sourceTree = "<group>"; };
+               93F0B3AA09BB4DC00068FCE3 /* Parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Parser.h; path = ../kjs/Parser.h; sourceTree = "<group>"; };
                93F1981A08245AAE001E9ABC /* keywords.table */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = keywords.table; sourceTree = "<group>"; tabWidth = 8; };
-               95C18D3E0C90E7EF00E72F73 /* JSRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRetainPtr.h; sourceTree = "<group>"; };
-               A8E894310CD0602400367179 /* JSCallbackObjectFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackObjectFunctions.h; sourceTree = "<group>"; };
-               A8E894330CD0603F00367179 /* JSGlobalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObject.h; sourceTree = "<group>"; };
+               95C18D3E0C90E7EF00E72F73 /* JSRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSRetainPtr.h; path = ../API/JSRetainPtr.h; sourceTree = "<group>"; };
+               A8E894310CD0602400367179 /* JSCallbackObjectFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSCallbackObjectFunctions.h; path = ../API/JSCallbackObjectFunctions.h; sourceTree = "<group>"; };
+               A8E894330CD0603F00367179 /* JSGlobalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSGlobalObject.h; path = ../kjs/JSGlobalObject.h; sourceTree = "<group>"; };
                BCF6553B0A2048DE0038A194 /* MathExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MathExtras.h; sourceTree = "<group>"; };
                D21202280AD4310C00ED79B6 /* DateMath.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DateMath.cpp; sourceTree = "<group>"; };
-               D21202290AD4310C00ED79B6 /* DateMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DateMath.h; sourceTree = "<group>"; };
+               D21202290AD4310C00ED79B6 /* DateMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DateMath.h; path = ../kjs/DateMath.h; sourceTree = "<group>"; };
                E11D51750B2E798D0056C188 /* StringExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringExtras.h; sourceTree = "<group>"; };
-               E195678F09E7CF1200B89D13 /* UnicodeIcu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnicodeIcu.h; sourceTree = "<group>"; };
-               E195679409E7CF1200B89D13 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Unicode.h; sourceTree = "<group>"; };
+               E195678F09E7CF1200B89D13 /* UnicodeIcu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UnicodeIcu.h; path = unicode/icu/UnicodeIcu.h; sourceTree = "<group>"; };
+               E195679409E7CF1200B89D13 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Unicode.h; path = unicode/Unicode.h; sourceTree = "<group>"; };
                E1EF79A80CE97BA60088D500 /* UTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UTF8.cpp; sourceTree = "<group>"; };
-               E1EF79A90CE97BA60088D500 /* UTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UTF8.h; sourceTree = "<group>"; };
-               F5BB2BC5030F772101FCFE1D /* completion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = completion.h; sourceTree = "<group>"; tabWidth = 8; };
+               E1EF79A90CE97BA60088D500 /* UTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UTF8.h; path = unicode/UTF8.h; sourceTree = "<group>"; };
+               F5BB2BC5030F772101FCFE1D /* completion.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = completion.h; path = ../kjs/completion.h; sourceTree = "<group>"; tabWidth = 8; };
                F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = JavaScriptCorePrefix.h; path = ../JavaScriptCorePrefix.h; sourceTree = "<group>"; tabWidth = 8; };
                F5FFE656026B47A6018635CA /* nodes2string.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nodes2string.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F68EBB8C0255D4C601FF60F7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; tabWidth = 8; };
+               F68EBB8C0255D4C601FF60F7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../kjs/config.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A84D0255597D01FF60F7 /* array_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = array_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A84E0255597D01FF60F7 /* array_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = array_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A84E0255597D01FF60F7 /* array_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = array_object.h; path = ../kjs/array_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8500255597D01FF60F7 /* bool_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bool_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
                F692A8520255597D01FF60F7 /* collector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = collector.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8530255597D01FF60F7 /* collector.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = collector.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8540255597D01FF60F7 /* create_hash_table */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.script.perl; path = create_hash_table; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8530255597D01FF60F7 /* collector.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = collector.h; path = ../kjs/collector.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8540255597D01FF60F7 /* create_hash_table */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = text.script.perl; name = create_hash_table; path = ../kjs/create_hash_table; sourceTree = "<group>"; tabWidth = 8; };
                F692A8550255597D01FF60F7 /* date_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = date_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8560255597D01FF60F7 /* date_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = date_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8560255597D01FF60F7 /* date_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = date_object.h; path = ../kjs/date_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8580255597D01FF60F7 /* debugger.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugger.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8590255597D01FF60F7 /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = debugger.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8590255597D01FF60F7 /* debugger.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = debugger.h; path = ../kjs/debugger.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A85A0255597D01FF60F7 /* error_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A85B0255597D01FF60F7 /* error_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = error_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A85B0255597D01FF60F7 /* error_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = error_object.h; path = ../kjs/error_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A85C0255597D01FF60F7 /* function_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A85D0255597D01FF60F7 /* function_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = function_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A85D0255597D01FF60F7 /* function_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = function_object.h; path = ../kjs/function_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A85E0255597D01FF60F7 /* function.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = function.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A85F0255597D01FF60F7 /* function.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = function.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A85F0255597D01FF60F7 /* function.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = function.h; path = ../kjs/function.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8610255597D01FF60F7 /* internal.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = internal.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8620255597D01FF60F7 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = internal.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8620255597D01FF60F7 /* internal.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = internal.h; path = ../kjs/internal.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8630255597D01FF60F7 /* interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = interpreter.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8640255597D01FF60F7 /* interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = interpreter.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8640255597D01FF60F7 /* interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = interpreter.h; path = ../kjs/interpreter.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8650255597D01FF60F7 /* lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lexer.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8660255597D01FF60F7 /* lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = lexer.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8660255597D01FF60F7 /* lexer.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = lexer.h; path = ../kjs/lexer.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8680255597D01FF60F7 /* lookup.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lookup.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8690255597D01FF60F7 /* lookup.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = lookup.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8690255597D01FF60F7 /* lookup.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = lookup.h; path = ../kjs/lookup.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A86A0255597D01FF60F7 /* math_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = math_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A86B0255597D01FF60F7 /* math_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = math_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A86B0255597D01FF60F7 /* math_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = math_object.h; path = ../kjs/math_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A86D0255597D01FF60F7 /* nodes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nodes.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A86E0255597D01FF60F7 /* nodes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = nodes.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A86E0255597D01FF60F7 /* nodes.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = nodes.h; path = ../kjs/nodes.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8700255597D01FF60F7 /* number_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = number_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8710255597D01FF60F7 /* number_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = number_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8710255597D01FF60F7 /* number_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = number_object.h; path = ../kjs/number_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8730255597D01FF60F7 /* object_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8740255597D01FF60F7 /* object_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = object_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8740255597D01FF60F7 /* object_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = object_object.h; path = ../kjs/object_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8750255597D01FF60F7 /* object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8760255597D01FF60F7 /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8760255597D01FF60F7 /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = object.h; path = ../kjs/object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8770255597D01FF60F7 /* operations.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = operations.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8780255597D01FF60F7 /* operations.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = operations.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8780255597D01FF60F7 /* operations.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = operations.h; path = ../kjs/operations.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8790255597D01FF60F7 /* property_map.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = property_map.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A87A0255597D01FF60F7 /* property_map.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = property_map.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A87A0255597D01FF60F7 /* property_map.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = property_map.h; path = ../kjs/property_map.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A87B0255597D01FF60F7 /* regexp_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexp_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A87C0255597D01FF60F7 /* regexp_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = regexp_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A87C0255597D01FF60F7 /* regexp_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = regexp_object.h; path = ../kjs/regexp_object.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A87D0255597D01FF60F7 /* regexp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regexp.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A87E0255597D01FF60F7 /* regexp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = regexp.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A87E0255597D01FF60F7 /* regexp.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = regexp.h; path = ../kjs/regexp.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A87F0255597D01FF60F7 /* string_object.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_object.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8800255597D01FF60F7 /* string_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = string_object.h; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8840255597D01FF60F7 /* types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8800255597D01FF60F7 /* string_object.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = string_object.h; path = ../kjs/string_object.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8840255597D01FF60F7 /* types.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = types.h; path = ../kjs/types.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8850255597D01FF60F7 /* ustring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ustring.cpp; sourceTree = "<group>"; tabWidth = 8; };
-               F692A8860255597D01FF60F7 /* ustring.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ustring.h; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8860255597D01FF60F7 /* ustring.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; name = ustring.h; path = ../kjs/ustring.h; sourceTree = "<group>"; tabWidth = 8; };
                F692A8870255597D01FF60F7 /* value.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = value.cpp; sourceTree = "<group>"; tabWidth = 8; };
 /* End PBXFileReference section */
 
                1432EBD70A34CAD400717B9F /* API */ = {
                        isa = PBXGroup;
                        children = (
-                               1482B78A0A4305AB00517CFC /* APICast.h */,
-                               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */,
                                1421359A0A677F4F00A8195E /* JSBase.cpp */,
-                               142711380A460BBB0080EEEA /* JSBase.h */,
                                1440F8AD0A508D200005F061 /* JSCallbackConstructor.cpp */,
-                               1440F8AC0A508D200005F061 /* JSCallbackConstructor.h */,
                                1440F8900A508B100005F061 /* JSCallbackFunction.cpp */,
-                               1440F88F0A508B100005F061 /* JSCallbackFunction.h */,
                                14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */,
-                               14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */,
-                               A8E894310CD0602400367179 /* JSCallbackObjectFunctions.h */,
                                1440FCE20A51E46B0005F061 /* JSClassRef.cpp */,
-                               1440FCE10A51E46B0005F061 /* JSClassRef.h */,
                                14BD5A290A3E91F600BAF59C /* JSContextRef.cpp */,
-                               14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */,
                                1482B7E20A43076000517CFC /* JSObjectRef.cpp */,
-                               1482B7E10A43076000517CFC /* JSObjectRef.h */,
-                               95C18D3E0C90E7EF00E72F73 /* JSRetainPtr.h */,
                                1482B74C0A43032800517CFC /* JSStringRef.cpp */,
-                               1482B74B0A43032800517CFC /* JSStringRef.h */,
                                146AAB370B66A94400E55F16 /* JSStringRefCF.cpp */,
-                               146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */,
                                14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */,
-                               1482B6EA0A4300B300517CFC /* JSValueRef.h */,
                        );
                        path = API;
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                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 */,
-                               1CAF34880A6C421700ABE06E /* WebScriptObject.h */,
                                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 */,
                        );
                        name = bindings;
                        sourceTree = "<group>";
                650FDF8D09D0FCA700769E54 /* Derived Sources */ = {
                        isa = PBXGroup;
                        children = (
-                               65FB3F4709D11B2400F49DEB /* date_object.lut.h */,
                                65FB3F4809D11B2400F49DEB /* grammar.cpp */,
-                               65FB3F4909D11B2400F49DEB /* grammar.h */,
-                               65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */,
-                               65FB3EB209D109F000F49DEB /* lexer.lut.h */,
-                               65B174F109D100FA00820339 /* math_object.lut.h */,
-                               65B174F209D100FA00820339 /* number_object.lut.h */,
-                               65B174F409D100FA00820339 /* string_object.lut.h */,
                                65B174BE09D1000200820339 /* chartables.c */,
-                               65B1749909D0FEB700820339 /* array_object.lut.h */,
                        );
                        name = "Derived Sources";
                        path = DerivedSources/JavaScriptCore;
                        isa = PBXGroup;
                        children = (
                                E195678D09E7CF1200B89D13 /* unicode */,
+                               65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
+                               65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
+                               65DFC92D08EA173A00F7300B /* HashTable.cpp */,
                                93AA4F770957251F0084B3A7 /* AlwaysInline.h */,
+                               1482B78A0A4305AB00517CFC /* APICast.h */,
+                               938772E5038BFE19008635CE /* array_instance.h */,
+                               F692A84E0255597D01FF60F7 /* array_object.h */,
+                               65B1749909D0FEB700820339 /* array_object.lut.h */,
                                938C4F690CA06BC700D9310A /* ASCIICType.h */,
-                               65E217B808E7EECC0023E5F6 /* Assertions.cpp */,
                                65E217B708E7EECC0023E5F6 /* Assertions.h */,
+                               704FD35305697E6D003DBED9 /* bool_object.h */,
+                               5182A53B06012C3000CBD2F2 /* c_class.h */,
+                               5182A45705FFCF4B00CBD2F2 /* c_instance.h */,
+                               5182A48C05FFFDC400CBD2F2 /* c_runtime.h */,
+                               5182A47005FFD45000CBD2F2 /* c_utility.h */,
+                               F692A8530255597D01FF60F7 /* collector.h */,
+                               5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */,
+                               65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
+                               F5BB2BC5030F772101FCFE1D /* completion.h */,
+                               F68EBB8C0255D4C601FF60F7 /* config.h */,
+                               F692A8540255597D01FF60F7 /* create_hash_table */,
+                               F692A8560255597D01FF60F7 /* date_object.h */,
+                               65FB3F4709D11B2400F49DEB /* date_object.lut.h */,
+                               D21202290AD4310C00ED79B6 /* DateMath.h */,
+                               F692A8590255597D01FF60F7 /* debugger.h */,
                                5186111D0CC824830081412B /* Deque.h */,
                                938C4F6B0CA06BCE00D9310A /* DisallowCType.h */,
-                               65E217B908E7EECC0023E5F6 /* FastMalloc.cpp */,
+                               651F6413039D5B5F0078395C /* dtoa.h */,
+                               F692A85B0255597D01FF60F7 /* error_object.h */,
+                               14BD53F30A3E12D800BAF59C /* ExecState.h */,
                                65E217BA08E7EECC0023E5F6 /* FastMalloc.h */,
                                935AF46909E9D9DB00ACD1D8 /* Forward.h */,
+                               F692A85F0255597D01FF60F7 /* function.h */,
+                               F692A85D0255597D01FF60F7 /* function_object.h */,
                                93B6A0DE0AA64DA40076DE27 /* GetPtr.h */,
+                               65FB3F4909D11B2400F49DEB /* grammar.h */,
                                657EEBBF094E445E008C9C7B /* HashCountedSet.h */,
                                65DFC92A08EA173A00F7300B /* HashFunctions.h */,
                                652246A40C8D7A0E007BDAF7 /* HashIterators.h */,
                                65DFC92B08EA173A00F7300B /* HashMap.h */,
                                65DFC92C08EA173A00F7300B /* HashSet.h */,
-                               65DFC92D08EA173A00F7300B /* HashTable.cpp */,
                                65DFC92E08EA173A00F7300B /* HashTable.h */,
                                65DFC92F08EA173A00F7300B /* HashTraits.h */,
+                               933A349A038AE7C6008635CE /* identifier.h */,
+                               F692A8620255597D01FF60F7 /* internal.h */,
+                               F692A8640255597D01FF60F7 /* interpreter.h */,
+                               14BD5A2F0A3E91F600BAF59C /* JavaScriptCore.h */,
+                               F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */,
+                               517D52DD056BF2F6003851BD /* jni_class.h */,
+                               517D5348056BFB5D003851BD /* jni_instance.h */,
+                               513DF74105C0861F00F89391 /* jni_jsobject.h */,
+                               511B0876056468BB0080E486 /* jni_runtime.h */,
+                               51856D900562EE95008B9D83 /* jni_utility.h */,
+                               142711380A460BBB0080EEEA /* JSBase.h */,
+                               1440F8AC0A508D200005F061 /* JSCallbackConstructor.h */,
+                               1440F88F0A508B100005F061 /* JSCallbackFunction.h */,
+                               14ABDF5D0A437FEF00ECCA01 /* JSCallbackObject.h */,
+                               A8E894310CD0602400367179 /* JSCallbackObjectFunctions.h */,
+                               1440FCE10A51E46B0005F061 /* JSClassRef.h */,
+                               14BD5A2A0A3E91F600BAF59C /* JSContextRef.h */,
+                               A8E894330CD0603F00367179 /* JSGlobalObject.h */,
+                               1483B589099BC1950016E4F0 /* JSImmediate.h */,
+                               65EA4C9A092AF9E20093D800 /* JSLock.h */,
+                               1482B7E10A43076000517CFC /* JSObjectRef.h */,
+                               95C18D3E0C90E7EF00E72F73 /* JSRetainPtr.h */,
+                               1482B74B0A43032800517CFC /* JSStringRef.h */,
+                               146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */,
+                               14ABB454099C2A0F00E2A24F /* JSType.h */,
+                               1482B6EA0A4300B300517CFC /* JSValueRef.h */,
+                               65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */,
+                               65B813A80CD1D01900DF59D6 /* LabelStack.h */,
+                               F692A8660255597D01FF60F7 /* lexer.h */,
+                               65FB3EB209D109F000F49DEB /* lexer.lut.h */,
+                               931C6CEF038EE8DE008635CE /* list.h */,
                                657EB7450B708F540063461B /* ListHashSet.h */,
                                148A1626095D16BB00666D0D /* ListRefPtr.h */,
+                               65F340840CD6C0DE00C0CA8B /* LocalStorage.h */,
+                               F692A8690255597D01FF60F7 /* lookup.h */,
                                5DBD18AF0C5401A700C15EAE /* MallocZoneSupport.h */,
+                               F692A86B0255597D01FF60F7 /* math_object.h */,
+                               65B174F109D100FA00820339 /* math_object.lut.h */,
                                BCF6553B0A2048DE0038A194 /* MathExtras.h */,
+                               F692A86E0255597D01FF60F7 /* nodes.h */,
                                9303F5690991190000AD71B8 /* Noncopyable.h */,
+                               517BE7F40610E39600221947 /* NP_jsobject.h */,
+                               51CA3B4F06CC2166005600E3 /* npapi.h */,
+                               5199B1BE061B65BC0070C006 /* npruntime.h */,
+                               84ABF1DE070B628C00A3AC05 /* npruntime_impl.h */,
+                               51DFF2C906CC36F6006F1ECC /* npruntime_priv.h */,
+                               F692A8710255597D01FF60F7 /* number_object.h */,
+                               65B174F209D100FA00820339 /* number_object.lut.h */,
+                               518CF93605C72271003CF905 /* objc_class.h */,
+                               51F0EC1005C86F3500E6DF1B /* objc_header.h */,
+                               51F0EB0005C85A6300E6DF1B /* objc_instance.h */,
+                               51C4974105C0A5D4006FBFF5 /* objc_runtime.h */,
+                               51F0EC9605C88DC700E6DF1B /* objc_utility.h */,
+                               F692A8760255597D01FF60F7 /* object.h */,
+                               F692A8740255597D01FF60F7 /* object_object.h */,
+                               F692A8780255597D01FF60F7 /* operations.h */,
                                9303F5A409911A5800AD71B8 /* OwnArrayPtr.h */,
                                9303F567099118FA00AD71B8 /* OwnPtr.h */,
+                               93F0B3AA09BB4DC00068FCE3 /* Parser.h */,
                                6580F795094070560082C219 /* PassRefPtr.h */,
+                               6541720F039E08B90058BFEB /* pcre.h */,
+                               93E26BE508B1517100F85226 /* pcre_internal.h */,
                                65D6D87E09B5A32E0002E4D7 /* Platform.h */,
+                               F692A87A0255597D01FF60F7 /* property_map.h */,
+                               65621E6C089E859700760F35 /* property_slot.h */,
+                               65400C100A69BAF200509887 /* PropertyNameArray.h */,
+                               65C02FBB0637462A003E7EE6 /* protect.h */,
                                65C647B3093EF8D60022C380 /* RefPtr.h */,
+                               F692A87E0255597D01FF60F7 /* regexp.h */,
+                               F692A87C0255597D01FF60F7 /* regexp_object.h */,
+                               65FB3F4C09D11B2400F49DEB /* regexp_object.lut.h */,
                                51F648D60BB4E2CA0033D760 /* RetainPtr.h */,
+                               511B0870056468730080E486 /* runtime.h */,
+                               7073BE3D0581291E005EE2C9 /* runtime_array.h */,
+                               51A58A8E057D3A6A00A3E942 /* runtime_method.h */,
+                               70B16A270569A10900DB756D /* runtime_object.h */,
+                               5114F47C05E4426200D1BBBD /* runtime_root.h */,
+                               14BD534A0A3E0AEA00BAF59C /* SavedBuiltins.h */,
+                               9374D3A7038D9D74008635CE /* scope_chain.h */,
+                               1419D1030CEA472C00FF507A /* Shared.h */,
+                               F692A8800255597D01FF60F7 /* string_object.h */,
+                               65B174F409D100FA00820339 /* string_object.lut.h */,
                                E11D51750B2E798D0056C188 /* StringExtras.h */,
+                               14A396A60CD2933100B5B4FF /* SymbolTable.h */,
                                6541BD6E08E80A17002CBEE7 /* TCPageMap.h */,
                                6541BD6F08E80A17002CBEE7 /* TCSpinLock.h */,
-                               6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
                                6541BD7108E80A17002CBEE7 /* TCSystemAlloc.h */,
+                               F692A8840255597D01FF60F7 /* types.h */,
+                               93E26BFC08B151D400F85226 /* ucpinternal.h */,
+                               E195679409E7CF1200B89D13 /* Unicode.h */,
+                               E195678F09E7CF1200B89D13 /* UnicodeIcu.h */,
                                935AF46B09E9D9DB00ACD1D8 /* UnusedParam.h */,
+                               F692A8860255597D01FF60F7 /* ustring.h */,
+                               E1EF79A90CE97BA60088D500 /* UTF8.h */,
+                               14ABB36E099C076400E2A24F /* value.h */,
                                6592C316098B7DE10003D4F6 /* Vector.h */,
                                6592C317098B7DE10003D4F6 /* VectorTraits.h */,
+                               1CAF34880A6C421700ABE06E /* WebScriptObject.h */,
+                               6541BD7008E80A17002CBEE7 /* TCSystemAlloc.cpp */,
                        );
                        path = wtf;
                        sourceTree = "<group>";
                        children = (
                                659126BC0BDD1728001921FB /* AllInOneFile.cpp */,
                                93ADFCE60CCBD7AC00D30B08 /* array_instance.cpp */,
-                               938772E5038BFE19008635CE /* array_instance.h */,
                                F692A84D0255597D01FF60F7 /* array_object.cpp */,
-                               F692A84E0255597D01FF60F7 /* array_object.h */,
                                F692A8500255597D01FF60F7 /* bool_object.cpp */,
-                               704FD35305697E6D003DBED9 /* bool_object.h */,
                                F692A8520255597D01FF60F7 /* collector.cpp */,
-                               F692A8530255597D01FF60F7 /* collector.h */,
                                5DBD18A90C54018700C15EAE /* CollectorHeapIntrospector.cpp */,
-                               5DBD18AA0C54018700C15EAE /* CollectorHeapIntrospector.h */,
                                65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */,
-                               65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
-                               F5BB2BC5030F772101FCFE1D /* completion.h */,
-                               F68EBB8C0255D4C601FF60F7 /* config.h */,
-                               F692A8540255597D01FF60F7 /* create_hash_table */,
                                F692A8550255597D01FF60F7 /* date_object.cpp */,
-                               F692A8560255597D01FF60F7 /* date_object.h */,
                                D21202280AD4310C00ED79B6 /* DateMath.cpp */,
-                               D21202290AD4310C00ED79B6 /* DateMath.h */,
                                F692A8580255597D01FF60F7 /* debugger.cpp */,
-                               F692A8590255597D01FF60F7 /* debugger.h */,
                                651F6412039D5B5F0078395C /* dtoa.cpp */,
-                               651F6413039D5B5F0078395C /* dtoa.h */,
                                F692A85A0255597D01FF60F7 /* error_object.cpp */,
-                               F692A85B0255597D01FF60F7 /* error_object.h */,
                                14BD53F40A3E12D800BAF59C /* ExecState.cpp */,
-                               14BD53F30A3E12D800BAF59C /* ExecState.h */,
                                9364B273045B7D6C00A9CAC1 /* fpconst.cpp */,
                                F692A85E0255597D01FF60F7 /* function.cpp */,
-                               F692A85F0255597D01FF60F7 /* function.h */,
                                F692A85C0255597D01FF60F7 /* function_object.cpp */,
-                               F692A85D0255597D01FF60F7 /* function_object.h */,
                                933A3499038AE7C6008635CE /* grammar.y */,
                                933A349D038AE80F008635CE /* identifier.cpp */,
-                               933A349A038AE7C6008635CE /* identifier.h */,
                                F692A8610255597D01FF60F7 /* internal.cpp */,
-                               F692A8620255597D01FF60F7 /* internal.h */,
                                F692A8630255597D01FF60F7 /* interpreter.cpp */,
-                               F692A8640255597D01FF60F7 /* interpreter.h */,
-                               F5C290E60284F98E018635CA /* JavaScriptCorePrefix.h */,
-                               A8E894330CD0603F00367179 /* JSGlobalObject.h */,
                                14760863099C633800437128 /* JSImmediate.cpp */,
-                               1483B589099BC1950016E4F0 /* JSImmediate.h */,
                                65EA4C99092AF9E20093D800 /* JSLock.cpp */,
-                               65EA4C9A092AF9E20093D800 /* JSLock.h */,
-                               14ABB454099C2A0F00E2A24F /* JSType.h */,
                                65C7A1710A8EAACB00FA37EA /* JSWrapperObject.cpp */,
-                               65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */,
                                93F1981A08245AAE001E9ABC /* keywords.table */,
-                               65B813A80CD1D01900DF59D6 /* LabelStack.h */,
                                F692A8650255597D01FF60F7 /* lexer.cpp */,
-                               F692A8660255597D01FF60F7 /* lexer.h */,
                                931C6CF0038EE8DE008635CE /* list.cpp */,
-                               931C6CEF038EE8DE008635CE /* list.h */,
-                               65F340840CD6C0DE00C0CA8B /* LocalStorage.h */,
                                F692A8680255597D01FF60F7 /* lookup.cpp */,
-                               F692A8690255597D01FF60F7 /* lookup.h */,
                                F692A86A0255597D01FF60F7 /* math_object.cpp */,
-                               F692A86B0255597D01FF60F7 /* math_object.h */,
                                F692A86D0255597D01FF60F7 /* nodes.cpp */,
-                               F692A86E0255597D01FF60F7 /* nodes.h */,
                                F5FFE656026B47A6018635CA /* nodes2string.cpp */,
                                F692A8700255597D01FF60F7 /* number_object.cpp */,
-                               F692A8710255597D01FF60F7 /* number_object.h */,
                                F692A8750255597D01FF60F7 /* object.cpp */,
-                               F692A8760255597D01FF60F7 /* object.h */,
                                F692A8730255597D01FF60F7 /* object_object.cpp */,
-                               F692A8740255597D01FF60F7 /* object_object.h */,
                                F692A8770255597D01FF60F7 /* operations.cpp */,
-                               F692A8780255597D01FF60F7 /* operations.h */,
                                93F0B3A909BB4DC00068FCE3 /* Parser.cpp */,
-                               93F0B3AA09BB4DC00068FCE3 /* Parser.h */,
                                F692A8790255597D01FF60F7 /* property_map.cpp */,
-                               F692A87A0255597D01FF60F7 /* property_map.h */,
                                65621E6B089E859700760F35 /* property_slot.cpp */,
-                               65621E6C089E859700760F35 /* property_slot.h */,
                                65400C0F0A69BAF200509887 /* PropertyNameArray.cpp */,
-                               65400C100A69BAF200509887 /* PropertyNameArray.h */,
-                               65C02FBB0637462A003E7EE6 /* protect.h */,
                                F692A87D0255597D01FF60F7 /* regexp.cpp */,
-                               F692A87E0255597D01FF60F7 /* regexp.h */,
                                F692A87B0255597D01FF60F7 /* regexp_object.cpp */,
-                               F692A87C0255597D01FF60F7 /* regexp_object.h */,
-                               14BD534A0A3E0AEA00BAF59C /* SavedBuiltins.h */,
                                9374D3A8038D9D74008635CE /* scope_chain.cpp */,
-                               9374D3A7038D9D74008635CE /* scope_chain.h */,
                                F692A87F0255597D01FF60F7 /* string_object.cpp */,
-                               F692A8800255597D01FF60F7 /* string_object.h */,
-                               14A396A60CD2933100B5B4FF /* SymbolTable.h */,
-                               F692A8840255597D01FF60F7 /* types.h */,
                                F692A8850255597D01FF60F7 /* ustring.cpp */,
-                               F692A8860255597D01FF60F7 /* ustring.h */,
                                F692A8870255597D01FF60F7 /* value.cpp */,
-                               14ABB36E099C076400E2A24F /* value.h */,
                        );
                        path = kjs;
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                6541720E039E08B90058BFEB /* dftables.cpp */,
-                               6541720F039E08B90058BFEB /* pcre.h */,
                                930754BF08B0F68000AB3056 /* pcre_compile.cpp */,
                                930754E908B0F78500AB3056 /* pcre_exec.cpp */,
-                               93E26BE508B1517100F85226 /* pcre_internal.h */,
                                93E26BC908B1511900F85226 /* pcre_ord2utf8.cpp */,
                                930754CE08B0F74500AB3056 /* pcre_tables.cpp */,
                                937013470CA97E0E00FA14D3 /* pcre_ucp_searchfuncs.cpp */,
                                93E26BD308B1514100F85226 /* pcre_xclass.cpp */,
-                               93E26BFC08B151D400F85226 /* ucpinternal.h */,
                        );
                        name = pcre;
                        sourceTree = "<group>";
                        isa = PBXGroup;
                        children = (
                                E195678E09E7CF1200B89D13 /* icu */,
-                               E195679409E7CF1200B89D13 /* Unicode.h */,
-                               E1EF79A90CE97BA60088D500 /* UTF8.h */,
                                E1EF79A80CE97BA60088D500 /* UTF8.cpp */,
                        );
                        path = unicode;
                E195678E09E7CF1200B89D13 /* icu */ = {
                        isa = PBXGroup;
                        children = (
-                               E195678F09E7CF1200B89D13 /* UnicodeIcu.h */,
                        );
                        path = icu;
                        sourceTree = "<group>";
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
+                               1419D2010CEA4D0D00FF507A /* Shared.h in Headers */,
                                1482B78B0A4305AB00517CFC /* APICast.h in Headers */,
                                938C4F6A0CA06BC700D9310A /* ASCIICType.h in Headers */,
                                93AA4F780957251F0084B3A7 /* AlwaysInline.h in Headers */,
index 1cf0b597c7f83f1ce01d3dddffae914277ea11c3..ef3664805137b07961b82b06e61425e8cbf712a0 100644 (file)
@@ -101,7 +101,6 @@ void Interpreter::init()
 {
     JSLock lock;
 
-    m_refCount = 0;
     m_timeoutTime = 0;
     m_recursion = 0;
     m_debugger= 0;
index e63af8418684bb6b98aa21ddb1c6c14f137ac486..cabc21c880da070768bdcbb740d2f96c3cce2bed 100644 (file)
@@ -26,8 +26,9 @@
 
 #include "ExecState.h"
 #include "protect.h"
-#include "value.h"
 #include "types.h"
+#include "value.h"
+#include <wtf/Shared.h>
 
 namespace KJS {
 
@@ -75,7 +76,7 @@ namespace KJS {
    * evaluation, and also provides access to built-in properties such as
    * " Object" and "Number".
    */
-  class Interpreter {
+  class Interpreter : public Shared<Interpreter> {
       friend class Collector;
   public:
     /**
@@ -100,6 +101,8 @@ namespace KJS {
      * initialized with the standard global properties.
      */
     Interpreter();
+    
+    virtual ~Interpreter(); // only deref should delete us
 
     /**
      * Resets the global object's default properties and adds the default object 
@@ -327,12 +330,7 @@ namespace KJS {
     
     bool timedOut();
     
-    void ref() { ++m_refCount; }
-    void deref() { if (--m_refCount <= 0) delete this; }
-    int refCount() const { return m_refCount; }
-    
 protected:
-    virtual ~Interpreter(); // only deref should delete us
     virtual bool shouldInterruptScript() const { return true; }
 
     unsigned m_timeoutTime;
@@ -347,8 +345,6 @@ private:
     Interpreter(const Interpreter&);
     Interpreter operator=(const Interpreter&);
     
-    int m_refCount;
-    
     ExecState* m_currentExec;
     JSGlobalObject* m_globalObject;
     ExecState m_globalExec;
index c5dc85e18874993ddf6fe84148d3e1dc631c462f..ee4d9324fe4b9f8a3a8758c326dd94a334ab4a32 100644 (file)
@@ -32,8 +32,7 @@
 namespace KJS {
 
 RegExp::RegExp(const UString& pattern)
-  : m_refCount(0)
-  , m_pattern(pattern)
+  : m_pattern(pattern)
   , m_flagBits(0)
   , m_constructionError(0)
   , m_numSubpatterns(0)
@@ -43,8 +42,7 @@ RegExp::RegExp(const UString& pattern)
 }
 
 RegExp::RegExp(const UString& pattern, const UString& flags)
-  : m_refCount(0)
-  , m_pattern(pattern)
+  : m_pattern(pattern)
   , m_flags(flags)
   , m_flagBits(0)
   , m_constructionError(0)
index 86a41076c1872f9890723dd1d0f8b68e362b17db..2ec9bcb826809b8f606e823e0dbb63ea89743d02 100644 (file)
@@ -29,7 +29,7 @@
 
 namespace KJS {
 
-  class RegExp : Noncopyable {
+  class RegExp : public Shared<RegExp> {
   private:
     enum { 
         Global = 1, 
@@ -42,10 +42,6 @@ namespace KJS {
     RegExp(const UString& pattern, const UString& flags);
     ~RegExp();
     
-    void ref() { ++m_refCount; }
-    void deref() { if (--m_refCount == 0) delete this; }
-    int refCount() { return m_refCount; }
-
     bool global() const { return m_flagBits & Global; }
     bool ignoreCase() const { return m_flagBits & IgnoreCase; }
     bool multiline() const { return m_flagBits & Multiline; }
@@ -62,8 +58,6 @@ namespace KJS {
   private:
     void compile();
     
-    int m_refCount;
-    
     // Data supplied by caller.
     UString m_pattern; // FIXME: Just decompile m_regExp instead of storing this.
     UString m_flags; // FIXME: Just decompile m_regExp instead of storing this.
diff --git a/JavaScriptCore/wtf/Shared.h b/JavaScriptCore/wtf/Shared.h
new file mode 100644 (file)
index 0000000..bdfa349
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef Shared_h
+#define Shared_h
+
+#include <wtf/Assertions.h>
+#include <wtf/Noncopyable.h>
+
+namespace WTF {
+
+template<class T> class Shared : Noncopyable {
+public:
+    Shared()
+        : m_refCount(0)
+#ifndef NDEBUG
+        , m_deletionHasBegun(false)
+#endif
+    {
+    }
+
+    void ref()
+    {
+        ASSERT(!m_deletionHasBegun);
+        ++m_refCount;
+    }
+
+    void deref()
+    {
+        ASSERT(!m_deletionHasBegun);
+        if (--m_refCount <= 0) {
+#ifndef NDEBUG
+            m_deletionHasBegun = true;
+#endif
+            delete static_cast<T*>(this);
+        }
+    }
+
+    bool hasOneRef()
+    {
+        ASSERT(!m_deletionHasBegun);
+        return m_refCount == 1;
+    }
+
+    int refCount() const
+    {
+        return m_refCount;
+    }
+
+private:
+    int m_refCount;
+#ifndef NDEBUG
+    bool m_deletionHasBegun;
+#endif
+};
+
+} // namespace WTF
+
+using WTF::Shared;
+
+#endif
index bd8beed19fa50ce90b3cdfda2be840c694491b5a..49afba77d854f597d75f1ed4b468e684aa66354e 100644 (file)
@@ -1,3 +1,11 @@
+2007-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Moved Shared.h into wtf so it could be used in more places.
+
+        * ForwardingHeaders/wtf/Shared.h: Added.
+
 2007-11-08  Mark Rowe  <mrowe@apple.com>
 
         Build fix.
diff --git a/JavaScriptGlue/ForwardingHeaders/wtf/Shared.h b/JavaScriptGlue/ForwardingHeaders/wtf/Shared.h
new file mode 100644 (file)
index 0000000..34710d5
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Shared.h>
index 6cf8f0d1e32a174291dc214d4a564a06d7a69eec..6d29f212511327c7f1c04cc0e898bed7ee22c10d 100644 (file)
@@ -1,3 +1,89 @@
+2007-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Moved Shared.h into wtf so it could be used in more places. Retained 
+        TreeShared, but moved it to its own file, TreeShared.h.
+
+        * ForwardingHeaders/wtf/Shared.h: Added.
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSSVGPODTypeWrapper.h:
+        * css/CSSFontFace.h:
+        * css/CSSRuleList.h:
+        * css/Counter.h:
+        * css/Pair.h:
+        * css/Rect.h:
+        * css/StyleBase.h:
+        * css/StyleSheetList.h:
+        * dom/Clipboard.h:
+        * dom/DOMImplementation.h:
+        * dom/Event.h:
+        * dom/EventListener.h:
+        * dom/NamedNodeMap.h:
+        * dom/NodeFilterCondition.h:
+        * dom/NodeList.h:
+        * dom/Range.h:
+        * dom/RangeException.h:
+        * dom/RegisteredEventListener.h:
+        * dom/Traversal.h:
+        * history/BackForwardList.h:
+        * history/CachedPage.h:
+        * history/HistoryItem.h:
+        * html/CanvasGradient.h:
+        * html/CanvasPattern.h:
+        * html/HTMLCollection.h:
+        * html/MediaError.h:
+        * html/TimeRanges.h:
+        * html/VoidCallback.h:
+        * ksvg2/css/SVGRenderStyleDefs.h:
+        * ksvg2/svg/SVGAnimatedTemplate.h:
+        * ksvg2/svg/SVGElementInstanceList.h:
+        * ksvg2/svg/SVGList.h:
+        * ksvg2/svg/SVGPathSeg.h:
+        * ksvg2/svg/SVGPreserveAspectRatio.h:
+        * ksvg2/svg/SVGRenderingIntent.h:
+        * ksvg2/svg/SVGTransform.h:
+        * ksvg2/svg/SVGUnitTypes.h:
+        * loader/DocumentLoader.h:
+        * loader/FormState.h:
+        * loader/ResourceLoader.h:
+        * loader/TextResourceDecoder.h:
+        * loader/icon/IconRecord.h:
+        * page/BarInfo.h:
+        * page/Console.h:
+        * page/DOMSelection.h:
+        * page/DOMWindow.h:
+        * page/History.h:
+        * page/InspectorController.cpp:
+        * page/Plugin.h:
+        * page/Screen.h:
+        * platform/ArrayImpl.h:
+        * platform/CString.h:
+        * platform/DeprecatedValueListImpl.cpp:
+        * platform/FontFallbackList.h:
+        * platform/FontFamily.h:
+        * platform/FontSelector.h:
+        * platform/GlyphPageTreeNode.h:
+        * platform/PopupMenu.h:
+        * platform/RegularExpression.cpp:
+        * platform/ScrollBar.h:
+        * platform/Shared.h: Removed.
+        * platform/SharedBuffer.h:
+        * platform/StringImpl.h:
+        * platform/graphics/Icon.h:
+        * platform/graphics/svg/SVGResource.h:
+        * platform/network/FormData.h:
+        * platform/network/ResourceHandleClient.h:
+        * rendering/RenderStyle.h:
+        * rendering/SVGCharacterLayoutInfo.h:
+        * storage/SQLResultSetRowList.h:
+        * xml/DOMParser.h:
+        * xml/XMLSerializer.h:
+        * xml/XPathEvaluator.h:
+        * xml/XPathExpression.h:
+        * xml/XPathNSResolver.h:
+        * xml/XPathResult.h:
+
 2007-11-13  Brady Eidson  <beidson@apple.com>
 
         JS bindings by Anders, reviewed by Brady
diff --git a/WebCore/ForwardingHeaders/wtf/Shared.h b/WebCore/ForwardingHeaders/wtf/Shared.h
new file mode 100644 (file)
index 0000000..34710d5
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/Shared.h>
index d1b3ba635c4b7db209440479e6139fe4bf06a798..4478a4f9fca9df1909414c73b40e22d50302261f 100644 (file)
                                RelativePath="..\platform\SegmentedString.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\platform\Shared.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\platform\SharedBuffer.cpp"\r
                                >\r
                                RelativePath="..\platform\Timer.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\platform\TreeShared.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\platform\UnicodeRange.cpp"\r
                                >\r
index f00cc1fd2a5d288c5fbe9aa387b7542e0267b296..bb0f04d59997ec919e6c6809d461216f81677b90 100644 (file)
@@ -53,6 +53,7 @@
                14115B5209F84B7100CA4FC1 /* Node.h in Headers */ = {isa = PBXBuildFile; fileRef = 14115B5109F84B7100CA4FC1 /* Node.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14115B7209F84CD600CA4FC1 /* JSNodeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */; };
                14115B7309F84CD600CA4FC1 /* JSNodeFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */; };
+               1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D2C40CEA6F6100FF507A /* TreeShared.h */; settings = {ATTRIBUTES = (Private, ); }; };
                142011B60A003133008303F9 /* JSCSSStyleDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 142011B40A003133008303F9 /* JSCSSStyleDeclaration.cpp */; };
                142011B70A003133008303F9 /* JSCSSStyleDeclaration.h in Headers */ = {isa = PBXBuildFile; fileRef = 142011B50A003133008303F9 /* JSCSSStyleDeclaration.h */; };
                1432E8470C51493800B1500F /* GCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1432E8460C51493800B1500F /* GCController.h */; };
                BCF7C0B80A1687CC0032F75B /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF7C0B70A1687CC0032F75B /* FontCache.h */; };
                BCF7C2340A16B5F80032F75B /* FontCacheMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */; };
                BCFB2E5E0979E46400BA703D /* CachedResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BCFB2E840979FD4F00BA703D /* Shared.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2E830979FD4F00BA703D /* Shared.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BCFB2F41097A24B500BA703D /* SegmentedString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */; };
                BCFB2F42097A24B500BA703D /* SegmentedString.h in Headers */ = {isa = PBXBuildFile; fileRef = BCFB2F40097A24B500BA703D /* SegmentedString.h */; };
                BCFB2F76097A2E1A00BA703D /* Arena.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCFB2F74097A2E1A00BA703D /* Arena.cpp */; };
                14115B5109F84B7100CA4FC1 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Node.h; sourceTree = "<group>"; };
                14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilter.cpp; sourceTree = "<group>"; };
                14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilter.h; sourceTree = "<group>"; };
+               1419D2C40CEA6F6100FF507A /* TreeShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeShared.h; sourceTree = "<group>"; };
                141B94E509EC4223000E9413 /* MouseEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MouseEvent.idl; sourceTree = "<group>"; };
                141B94EE09EC425A000E9413 /* UIEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = UIEvent.idl; sourceTree = "<group>"; };
                142011AE0A003117008303F9 /* CSSStyleDeclaration.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CSSStyleDeclaration.idl; sourceTree = "<group>"; };
                BCF7C0B70A1687CC0032F75B /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FontCache.h; sourceTree = "<group>"; };
                BCF7C2330A16B5F80032F75B /* FontCacheMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FontCacheMac.mm; sourceTree = "<group>"; };
                BCFB2E5D0979E46400BA703D /* CachedResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClient.h; sourceTree = "<group>"; };
-               BCFB2E830979FD4F00BA703D /* Shared.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Shared.h; sourceTree = "<group>"; };
                BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentedString.cpp; sourceTree = "<group>"; };
                BCFB2F40097A24B500BA703D /* SegmentedString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SegmentedString.h; sourceTree = "<group>"; };
                BCFB2F74097A2E1A00BA703D /* Arena.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Arena.cpp; sourceTree = "<group>"; };
                                BC014C730CC5579D009C4B20 /* SecurityOrigin.h */,
                                BCFB2F3F097A24B500BA703D /* SegmentedString.cpp */,
                                BCFB2F40097A24B500BA703D /* SegmentedString.h */,
-                               BCFB2E830979FD4F00BA703D /* Shared.h */,
                                1A4A954B0B4EDCCB002D8C3C /* SharedBuffer.cpp */,
                                1A4A954C0B4EDCCB002D8C3C /* SharedBuffer.h */,
                                93309EA0099EB78C0056E581 /* SharedTimer.h */,
                                51E1ECB20C91C55600DC255B /* Threading.h */,
                                93309EA1099EB78C0056E581 /* Timer.cpp */,
                                9305B24C098F1B6B00C28855 /* Timer.h */,
+                               1419D2C40CEA6F6100FF507A /* TreeShared.h */,
                                514C762C0CE921F4007EF3CD /* UnicodeRange.cpp */,
                                514C762D0CE921F4007EF3CD /* UnicodeRange.h */,
                                9380F47109A11AB4001FDB34 /* Widget.cpp */,
                                93F1994F08245E59001E9ABC /* Settings.h in Headers */,
                                A80E6CE80A1989CA007FB8C5 /* ShadowValue.h in Headers */,
                                37919C1D0BF3762800956998 /* ShapeArabic.h in Headers */,
-                               BCFB2E840979FD4F00BA703D /* Shared.h in Headers */,
                                1A4A954E0B4EDCCB002D8C3C /* SharedBuffer.h in Headers */,
                                93309EA3099EB78C0056E581 /* SharedTimer.h in Headers */,
                                4B6FA6F40C39E48C00087011 /* SmartReplace.h in Headers */,
                                BCB16C2D0979C3BD00467741 /* loader.h in Headers */,
                                93309DF8099E64920056E581 /* markup.h in Headers */,
                                93309E1E099E64920056E581 /* visible_units.h in Headers */,
+                               1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
index f2a9062c61549c592e832bdb310b0db7c2279dfc..3e4ebee4093d99b53029b65d91bc0df2dab7f923 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(SVG)
 
 #include "Frame.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SVGElement.h"
 
 #include <wtf/Assertions.h>
index e817952f1c84aef0b7c6d2c99f63dba953e3de49..45232ff944823e288496846acda28237f37639d3 100644 (file)
@@ -27,7 +27,7 @@
 #define CSSFontFace_h
 
 #include <wtf/Vector.h>
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 682e798c2e1c60b75f2fec1489bf02a218f7e1ea..93b55992e8200c9ac07d3aae947f42d86b5414a9 100644 (file)
@@ -25,7 +25,7 @@
 #define CSSRuleList_h
 
 #include "DeprecatedPtrList.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 2f05ab73da342a1cc5c3a42709c40906221ad1b7..02ff6b0bd8c7906f3f6cef63639f8e7709cd3389 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "CSSPrimitiveValue.h"
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
index 4120ca296f4c2fe2b106fef957d6937bab7f2086..9840c197908b5f62425893cf6f6def4164703185 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef Pair_h
 #define Pair_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "CSSPrimitiveValue.h"
 #include <wtf/PassRefPtr.h>
 
index c2bd064c2bb20efb7a9cab2140c80d6c93664133..41f43228e21bfac753c3dcd01ab0c081454bd8aa 100644 (file)
@@ -22,7 +22,7 @@
 #define Rect_h
 
 #include "CSSPrimitiveValue.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 
index aeff24f089eda775eead210e21d20bdac112c98f..c2388473dc4c9dccd7967efd29b4f1e8ad2bf188 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef StyleBase_h
 #define StyleBase_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 6fe11a67c9317ed46d1d8d26b2ab247a2d591f67..8ec88ae5befd2f4a6feb834cecee9bfea7c8d9af 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef StyleSheetList_h
 #define StyleSheetList_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "DeprecatedPtrList.h"
 
 namespace WebCore {
index 50046270464cd6081e21172ae0a66be6bca0c954..0037c32375e04caa9504a70f841cf2bbd1c0feeb 100644 (file)
@@ -33,7 +33,7 @@
 #include "DragImage.h"
 #include "IntPoint.h"
 #include "Node.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index db28ff84e12a75ba5546ed7925f1b8be1b57860d..4d1ad426a36a26c4a9ca99290f3e64e518c6a5a5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef DOMImplementation_h
 #define DOMImplementation_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 
 namespace WebCore {
index dd01045bc4108e07270c47f748890e237deaa62c..b210a8fefea3438c42c8114fea53791df953a0b0 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "AtomicString.h"
 #include "EventTarget.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 2b7253e7094c79637c27c29f391218b0ef9560c0..2b925cf3c3cd3688431413f2018d54a0950bc7ba 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef EventListener_h
 #define EventListener_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 1cb9856cacd2862fd7dc9e635f4ab7a89ab694ef..6a3d6aaa12c605a762ed34f0d0c10715d98c9b08 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef NamedNodeMap_h
 #define NamedNodeMap_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/PassRefPtr.h>
 
 namespace WebCore {
index 6d561deb09a2fea20e87b1671d98465190458090..72886a0c6d997a323e70a748f83ba61f183c20a9 100644 (file)
@@ -25,8 +25,9 @@
 #define Node_h
 
 #include "DocPtr.h"
-#include "PlatformString.h"
 #include "DeprecatedString.h"
+#include "PlatformString.h"
+#include "TreeShared.h"
 #include <wtf/Assertions.h>
 #include <wtf/HashSet.h>
 #include <wtf/PassRefPtr.h>
index e533cca984ba7ba4c1e77c23bed9d12ecd837e52..50298f72616f870a9404252671648f09b098ea07 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef NodeFilterCondition_h
 #define NodeFilterCondition_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index a29281e7fe02caeb28002d9d82f9e7c12ebfbdb9..597fe02f08293d1122eefe17562b8b2c2c0a1b90 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef NodeList_h
 #define NodeList_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 
index a1bcaa331de9efa7ec052c08e62b3930bda2e67e..b01151070e1573e0f4fd5fe4fe3f6fd4a538f614 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef Range_h
 #define Range_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
index 85fe58d2b9b87197c9390005632b768987d02a3b..e7058a22891f463292ca85bb60040bb919f2ef11 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef RangeException_h
 #define RangeException_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 51a2851a8b11969c649502eb8f757a837ffc4e26..2eb9663eeb6e8e694b0bcca2bf956b0e920aeae1 100644 (file)
@@ -27,7 +27,7 @@
 #define RegisteredEventListener_h
 
 #include "AtomicString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index dcc1f59062fe911dc2c84f579bc0d32960ddda96..e00e590c586272c1b9f0fc3a188b54241a2f56db 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef Traversal_h
 #define Traversal_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 
index b3113e4344dde45a47042d1623491392ae092824..6b5e4ed6c9eb2aa72277b8f758094d8f56c3c1b8 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef BackForwardList_h
 #define BackForwardList_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/HashSet.h>
 #include <wtf/Vector.h>
index 2c730299d97ec11c97fab04d5ff53463e5bf623d..590cde3b143076238f513f6f804044b3c17b90dc 100644 (file)
@@ -27,7 +27,7 @@
 #define CachedPage_h
 
 #include "DocumentLoader.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 #include <wtf/OwnPtr.h>
index b2203ba37934ac8848db6405a34b7d41fb6d3e6a..282389f6993f6e1c62644f6ff712cb5c616e0d42 100644 (file)
@@ -31,7 +31,7 @@
 #include "IntPoint.h"
 #include "KURL.h"
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "StringHash.h"
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
index b198c4e575ef10b410ca330af6395480cc384d92..c9c7554d9929b1d58269cd2c85b5ed16e04a30a4 100644 (file)
@@ -28,7 +28,7 @@
 #define CanvasGradient_h
 
 #include "FloatPoint.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Vector.h>
 
 #if PLATFORM(CG)
index 86f8f5287af782b5039cefc57f5473a4e9b97740..cde2cbc26f370ebeb7215633cc618b958101d865 100644 (file)
@@ -27,7 +27,7 @@
 #define CanvasPattern_h
 
 #include "CachedResourceClient.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 #if PLATFORM(CG)
 #include <wtf/RetainPtr.h>
index 9f7bd9582b203a192e5dbd0f7735cb47965f5bca..3bdc7e3cb7637c7863f51f5306f3905e0e07d911 100644 (file)
@@ -25,7 +25,7 @@
 #ifndef HTMLCollection_h
 #define HTMLCollection_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
index bb32a8715387f2710552e2182f8c24d29a53cbb0..60a84ffb64902b1abfd016677cb39002f1e4d495 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(VIDEO)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 90a6de93685dd81e6ab3fc5e01c35e11f51fa25a..929c0fc828c7c3caa7825dde36fe2a4f548cf7dd 100644 (file)
@@ -27,7 +27,7 @@
 #define TimeRanges_h
 
 #include "ExceptionCode.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "wtf/Vector.h"
 
 namespace WebCore {
index b47e90fcb7ca8eb1d37d8474667f771a48fdddaa..15c489260fc17d5740deaf6ecdc3e6c707d3a7aa 100644 (file)
@@ -27,7 +27,7 @@
 #define VoidCallback_h
 
 #include <kjs/protect.h>
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "wtf/PassRefPtr.h"
 
 namespace WebCore {
index 65e4a86a26033ecc7d663a53d10fa15b38940e1e..a9c6198810c0eef083665ad8c8629e10a5edda77 100644 (file)
@@ -33,7 +33,7 @@
 #include "Color.h"
 #include "Path.h"
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/RefPtr.h>
 
 // Helper macros for 'SVGRenderStyle'
index be7bfeda719220f138d33fd60a76bcc197aff39c..b6e387d3cd848fe677fac1c2db1fdda814204081 100644 (file)
@@ -25,7 +25,7 @@
 
 #if ENABLE(SVG)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "AtomicString.h"
 
 namespace WebCore {
index 324ba63e740e2feae9d68b40f64cb6c4a5ab5e21..8b5e2035bced04ea1100f76d1484348df76e4b07 100644 (file)
@@ -24,7 +24,7 @@
 
 #if ENABLE(SVG)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SVGElementInstance.h"
 
 namespace WebCore {
index cf481a4a9be5f1f204d78f91f695017ae706a5ca..137363c098bff8e9a7d7dc7d65751ac592ff8a4d 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <wtf/Vector.h>
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SVGListTraits.h"
 #include "ExceptionCode.h"
 
index 0c26def6b6125df7cfada61148001e2c94c5c9d1..5f85f5d7d0ffe9f3138cfe2406c7cc0a85e4aab2 100644 (file)
@@ -26,7 +26,7 @@
 #if ENABLE(SVG)
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore
 {
index 4b6e7054faffabcc9d47737a9b0462191ffda48a..70671de59be405c7f2aa109ac188e47bcdfed68b 100644 (file)
@@ -25,7 +25,7 @@
 
 #if ENABLE(SVG)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <PlatformString.h>
 
 namespace WebCore {
index b68beb4819431f1e95e1e7acc07c5dc9f50c9f51..2b6f59ea1ea82f8b5d5ccacd315af837ebad26d6 100644 (file)
@@ -24,7 +24,7 @@
 
 #if ENABLE(SVG)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 01f342b90300ec6b97ae7321c106209a5c56ad85..2b438c503fc026c359db81fff23bfe1fd6b7f135 100644 (file)
@@ -26,7 +26,7 @@
 
 #include "AffineTransform.h"
 #include "FloatPoint.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 8d3cf9177bb1bb1fccb2688f31a9a3d50dfa824a..58450dcae48cdbc3f8d9a37cfd68eae3b8adad53 100644 (file)
@@ -24,7 +24,7 @@
 
 #if ENABLE(SVG)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 231394d5987bcdcc7c44e6ec35bfbed519354f48..cbacffa190ffa976b3a4ef20d2c41d63d3210d97 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "IconDatabase.h"
 #include "NavigationAction.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "PlatformString.h"
 #include "ResourceError.h"
 #include "ResourceRequest.h"
index e34c269dc844ee7b5a66553d4cb1265246977867..d833fb3383f1a4c9c1cb33485ccffa18d05fbeff 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef FormState_h
 #define FormState_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "StringHash.h"
 #include <wtf/HashMap.h>
 
index 475347219b9a162c126bcf50f0c0554846bae3cc..c1a1d2e2ad6b61f1e500c939ca198d774b79525e 100644 (file)
@@ -33,7 +33,7 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ResourceLoader.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "AuthenticationChallenge.h"
 #include "KURL.h"
 
index d8019289fb9476000bd000498e0d518beb4df29b..abdd73007ee9935217336e6669a89544f4967659 100644 (file)
@@ -26,7 +26,7 @@
 #define TextResourceDecoder_h
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "TextDecoder.h"
 #include <wtf/Vector.h>
 
index d2b8912eecb76faaa8b417271b85f7729efd3fe4..3c8042de052a2a4775bdd70c537decbe9a352724 100644 (file)
@@ -30,7 +30,7 @@
 #define IconRecord_h
 
 #include "PageURLRecord.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SharedBuffer.h"
 
 #include <wtf/HashSet.h>
index fd1cdc744577a12ee9e1a8b944a70585cb7db187..6952906bf182016616fd6c9b816f050bcfbdf65a 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef BarInfo_h
 #define BarInfo_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 88bbf9fb9d033fb64ccac844f200c61828ad7920..ce6f8c8c6eb6f604c66878945a1c05ad09f552e4 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef Console_h
 #define Console_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "PlatformString.h"
 
 namespace WebCore {
index 489849ba3d516abe1af831693ae10296bd5d22be..cde3dc7b28c0ccf7ae721033b0d4abc612e7ce0e 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef DOMSelection_h
 #define DOMSelection_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 
index 37ad993a55810b2a1567378f03aff9fb477c0923..c8df4d6f3040ab357c727995179bcba50fc366b0 100644 (file)
@@ -27,7 +27,7 @@
 #define DOMWindow_h
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
 
index a396f33d51f44d09053a928202de1a06a306f8a3..fff268fce7ac5401b0149f5c29263aefbf50a10a 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef History_h
 #define History_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index adc7a6f902124ac85537598281d856169494f762..29e1bc322d13d1345f520792c41640bf08fb2114 100644 (file)
@@ -51,7 +51,7 @@
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "Settings.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SharedBuffer.h"
 #include "SystemTime.h"
 #include "TextEncoding.h"
index c90f2e536f3acc1a50a8f36556cabd50aa94da2c..e1bba7b0c9449e364cfc93f5edd9704e6943b40b 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef Plugin_h
 #define Plugin_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 6f1caeac3d1ea88a609aa065a2d1e80f70517516..fd6f6d1298b39e86afccfdf8cc97e30cd39069d9 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef Screen_h
 #define Screen_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index adf5e94b43e88d217594b3ed323e1571c060c706..ef172b5b283b4e7d17490cc086119b3e034ab5e7 100644 (file)
@@ -27,7 +27,7 @@
 #define ArrayImpl_h
 
 #include <wtf/RefPtr.h>
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index 41ee8cf46bbc2a8db5572946d77c5b662ea8c9d0..1e631a61595021d620d803f7fcc5138af7311926 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CString_h
 #define CString_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Vector.h>
 
 using std::min;
index be741052e327940675734765b147cce50d1da07e..aa42019021f4720a5931fc01ecd8d7e93550530e 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "DeprecatedValueListImpl.h"
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <stdlib.h>
 
 namespace WebCore {
index 18a806a16d1e95d0281fd53b22e163f005b7dcbc..d87b8c9c9ab260272200c9cf79908766966598e0 100644 (file)
@@ -25,7 +25,7 @@
 // and so this should catch anyone trying to include this file in public cpp files.
 
 #include "FontData.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "FontSelector.h"
 #include <wtf/Vector.h>
 
index 58af23729b5b0fef4c7937577cccb90def9aed25..28b1cba307ef4ed2e920382e31aeda3560cae143 100644 (file)
@@ -27,7 +27,7 @@
 #define FontFamily_h
 
 #include "AtomicString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 0a835615c4eeaee57cacaa5b9ae6a7cc5ca7665d..bd738df3d35e3cbb45fee0d799ce024e61befd9b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef FontSelector_h
 #define FontSelector_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index ee448df93b7342c5e68b00b7d317f5648963d641..1ca1ff48c4383343b76bf5d1d772ea6a8231b65a 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef GlyphPageTreeNode_h
 #define GlyphPageTreeNode_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/unicode/Unicode.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/HashMap.h>
index 37505ab50d8ccd9ed930392e1a6e2d0caaf90be1..8a8601718a5049b812a9d5b5eab735868f709527 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef PopupMenu_h
 #define PopupMenu_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 #include "IntRect.h"
 #include "PopupMenuClient.h"
index fc4fd3407f56ea0457a44152848797750d08cf32..9701dbf3eb8831dec913fd0aeae4e4d1075d2a8f 100644 (file)
@@ -27,7 +27,7 @@
 #include "RegularExpression.h"
 
 #include "Logging.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <pcre/pcre.h>
 #include <sys/types.h>
 
index 36e86163f095b1e8153359f06ad5196e2709a87f..3d6dd4f8eebd04cc05f67ed56de6c7d47aaa57bd 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ScrollBar_h
 #define ScrollBar_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "ScrollTypes.h"
 #include <wtf/MathExtras.h>
 
index c05e908cfda5d456d5bfa5d094bc369c73605e83..0325f2e25f0e608d0f0fd435e4753454c0cf6244 100644 (file)
@@ -26,7 +26,7 @@
 #define SharedBuffer_h
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 #include <wtf/Vector.h>
 
index 89a84f3669d02d0ac8cef5a405957858815bed40..c1e0da3b663fc1ee5aaf192efcc6689e7de2c411 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef StringImpl_h
 #define StringImpl_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/unicode/Unicode.h>
 #include <kjs/identifier.h>
 #include <wtf/Forward.h>
similarity index 76%
rename from WebCore/platform/Shared.h
rename to WebCore/platform/TreeShared.h
index 4f0800abe4d6594167ae888b1e5d9174437ff8f9..aaa26aa5442a827a621b0ced0a371c5115a635f0 100644 (file)
  *
  */
 
-#ifndef Shared_h
-#define Shared_h
+#ifndef TreeShared_h
+#define TreeShared_h
 
 #include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
 
 namespace WebCore {
 
-template<class T> class Shared : Noncopyable {
-public:
-    Shared()
-        : m_refCount(0)
-#ifndef NDEBUG
-        , m_deletionHasBegun(false)
-#endif
-    {
-    }
-
-    void ref()
-    {
-        ASSERT(!m_deletionHasBegun);
-        ++m_refCount;
-    }
-
-    void deref()
-    {
-        ASSERT(!m_deletionHasBegun);
-        if (--m_refCount <= 0) {
-#ifndef NDEBUG
-            m_deletionHasBegun = true;
-#endif
-            delete static_cast<T*>(this);
-        }
-    }
-
-    bool hasOneRef()
-    {
-        ASSERT(!m_deletionHasBegun);
-        return m_refCount == 1;
-    }
-
-    int refCount() const
-    {
-        return m_refCount;
-    }
-
-private:
-    int m_refCount;
-#ifndef NDEBUG
-    bool m_deletionHasBegun;
-#endif
-};
-
 template<class T> class TreeShared : Noncopyable {
 public:
     TreeShared()
@@ -150,4 +105,4 @@ private:
 
 }
 
-#endif
+#endif // TreeShared.h
index 281f0c1640469b5067f3a20c9af1be7a0d70b749..f9dff6da4ed669e1a41ed8f0255b268a9866a096 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef Icon_h
 #define Icon_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 
 #if PLATFORM(MAC)
index 7acfe295bf1ee2bf8288dc5625b89fe51e8f5616..36a5d0878d9526f4f9668903f0e2a6d5e8e9d130 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(SVG)
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "StringHash.h"
 
 #include <wtf/HashMap.h>
index 6060e8efff715a9464d58fe0a751fc156ec5c73e..2b30cacc9661db070ed3bd50dc956c20d42206ee 100644 (file)
@@ -21,7 +21,7 @@
 #define FormData_h
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 11583a0ac7d0dd5b647940795bf7402b63603944..1d43441b128d39d2f2d1ff785d901d722a6dbcce 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ResourceHandleClient_h
 #define ResourceHandleClient_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Platform.h>
 #include <wtf/RefPtr.h>
 
index 368f05720b93b9f714e7b23b82b55fc139f4ea99..f6964800b97677dfd365a321ff47e63226f70978 100644 (file)
@@ -50,7 +50,7 @@
 #include "IntRect.h"
 #include "Length.h"
 #include "Pair.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "TextDirection.h"
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
index 2f1aac82eb0484d39b4f071aea15922b6d2a7498..918ce974c19625d9ed1432e9bc3d2d0770eeec49 100644 (file)
@@ -30,7 +30,7 @@
 #include <wtf/Vector.h>
 
 #include "AffineTransform.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SVGRenderStyle.h"
 #include "SVGTextContentElement.h"
 
index 60b00118a956dbc226c1ccc51e99267bb6c61f64..e199757a10b154d96e7abfe5b4a3f3de190b1054 100644 (file)
@@ -30,7 +30,7 @@
 #define SQLResultSetRowList_h
 
 #include "PlatformString.h"
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "SQLValue.h"
 #include <wtf/Vector.h>
 
index e0150ce5b0d64c957742b285abc216a460735e87..fd1aae8c88c82493d10e375515b24d6ac55b197d 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef DOMParser_h
 #define DOMParser_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "Document.h"
 
 namespace WebCore {
index 4f996ac8c67576affec02da655b5c7538d48d50f..d39bd255ec33e260b8029babfe49a4125964a130 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef XMLSerializer_h
 #define XMLSerializer_h
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "PlatformString.h"
 
 namespace WebCore {
index c8fe47f8d762c7066d53e7711758a54875953122..7ad259a8e6733b81b4c709b3c27e7ab7dfc61e03 100644 (file)
@@ -29,7 +29,7 @@
 
 #if ENABLE(XPATH)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 
 namespace WebCore {
index a769bb45ff52a89953c85921b85d17701d448347..7e5e17927ca0b6758644e54e951b642a0c2d0857 100644 (file)
@@ -29,7 +29,7 @@
 
 #if ENABLE(XPATH)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include <wtf/Forward.h>
 
 namespace WebCore {
index 0e8fcd09f5161a4228b0d315526d6bd54365c07c..74b9c4f839eabcb911f14350d97756305b820aa3 100644 (file)
@@ -29,7 +29,7 @@
 
 #if ENABLE(XPATH)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 
 namespace WebCore {
 
index fdea41a8ff3da7e150d96c46c54b523bb24545f1..889681c5c5f424e7b4de2775b5b55b4fa50059e1 100644 (file)
@@ -29,7 +29,7 @@
 
 #if ENABLE(XPATH)
 
-#include "Shared.h"
+#include <wtf/Shared.h>
 #include "XPathValue.h"
 
 namespace WebCore {
index 89442d577e13ecd3a47c5e901d6af251871dcd14..92309757944c4b9ea85d967656ba56e3fcae19d2 100644 (file)
@@ -1,3 +1,12 @@
+2007-11-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Moved Shared.h into wtf so it could be used in more places.
+
+        * ChangeLog:
+        * WebCoreSupport/WebContextMenuClient.h:
+
 2007-11-13  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/mac/ForwardingHeaders/wtf/Shared.h b/WebKit/mac/ForwardingHeaders/wtf/Shared.h
new file mode 100644 (file)
index 0000000..01a1520
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/Shared.h>
index f3c70c56e7e4fb8b44f1bb6b87a986af99c8e42e..0f4987ea7524bb369f684463c45fe120d72210f1 100644 (file)
@@ -27,8 +27,8 @@
  */
 
 #import <WebCore/ContextMenuClient.h>
-#import <WebCore/Shared.h>
 #import <wtf/Forward.h>
+#import <wtf/Shared.h>
 
 @class WebView;