Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
authormhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Jan 2013 21:39:55 +0000 (21:39 +0000)
committermhahnenberg@apple.com <mhahnenberg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Jan 2013 21:39:55 +0000 (21:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=107327

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

We're renaming these two files, so we have to replace the names everywhere.

* API/APICast.h:
* API/APIJSValue.h: Removed.
* API/JSBlockAdaptor.mm:
* API/JSStringRefCF.cpp:
* API/JSValue.h: Copied from Source/JavaScriptCore/API/APIJSValue.h.
* API/JSValue.mm:
* API/JSValueInternal.h:
* API/JSValueRef.cpp:
* API/JSWeakObjectMapRefPrivate.cpp:
* API/JavaScriptCore.h:
* CMakeLists.txt:
* GNUmakefile.list.am:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* Target.pri:
* bytecode/CallLinkStatus.h:
* bytecode/CodeBlock.cpp:
* bytecode/MethodOfGettingAValueProfile.h:
* bytecode/ResolveGlobalStatus.cpp:
* bytecode/ResolveGlobalStatus.h:
* bytecode/SpeculatedType.h:
* bytecode/ValueRecovery.h:
* dfg/DFGByteCodeParser.cpp:
* dfg/DFGJITCompiler.cpp:
* dfg/DFGNode.h:
* dfg/DFGSpeculativeJIT.cpp:
* dfg/DFGSpeculativeJIT64.cpp:
* heap/CopiedBlock.h:
* heap/HandleStack.cpp:
* heap/HandleTypes.h:
* heap/WeakImpl.h:
* interpreter/Interpreter.h:
* interpreter/Register.h:
* interpreter/VMInspector.h:
* jit/HostCallReturnValue.cpp:
* jit/HostCallReturnValue.h:
* jit/JITCode.h:
* jit/JITExceptions.cpp:
* jit/JITExceptions.h:
* jit/JSInterfaceJIT.h:
* llint/LLIntCLoop.h:
* llint/LLIntData.h:
* llint/LLIntSlowPaths.cpp:
* profiler/ProfilerBytecode.h:
* profiler/ProfilerBytecodeSequence.h:
* profiler/ProfilerBytecodes.h:
* profiler/ProfilerCompilation.h:
* profiler/ProfilerCompiledBytecode.h:
* profiler/ProfilerDatabase.h:
* profiler/ProfilerOSRExit.h:
* profiler/ProfilerOSRExitSite.h:
* profiler/ProfilerOrigin.h:
* profiler/ProfilerOriginStack.h:
* runtime/ArgList.cpp:
* runtime/CachedTranscendentalFunction.h:
* runtime/CallData.h:
* runtime/Completion.h:
* runtime/ConstructData.h:
* runtime/DateConstructor.cpp:
* runtime/DateInstance.cpp:
* runtime/DatePrototype.cpp:
* runtime/JSAPIValueWrapper.h:
* runtime/JSCJSValue.cpp: Copied from Source/JavaScriptCore/runtime/JSValue.cpp.
* runtime/JSCJSValue.h: Copied from Source/JavaScriptCore/runtime/JSValue.h.
(JSValue):
* runtime/JSCJSValueInlines.h: Copied from Source/JavaScriptCore/runtime/JSValueInlines.h.
* runtime/JSGlobalData.h:
* runtime/JSGlobalObject.cpp:
* runtime/JSGlobalObjectFunctions.h:
* runtime/JSStringJoiner.h:
* runtime/JSValue.cpp: Removed.
* runtime/JSValue.h: Removed.
* runtime/JSValueInlines.h: Removed.
* runtime/LiteralParser.h:
* runtime/Operations.h:
* runtime/PropertyDescriptor.h:
* runtime/PropertySlot.h:
* runtime/Protect.h:
* runtime/RegExpPrototype.cpp:
* runtime/Structure.h:

Source/WebCore:

No new tests.

We're renaming these two files, so we have to replace the names everywhere.

* ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebCore/ForwardingHeaders/runtime/JSValue.h.
* ForwardingHeaders/runtime/JSValue.h: Removed.
* WebCore.vcproj/WebCore.vcproj:
* bindings/js/JSArrayBufferViewHelper.h:
* bindings/js/JSCustomXPathNSResolver.h:
* bindings/js/JSHTMLAllCollectionCustom.cpp:
* bindings/js/JSIntentConstructor.cpp:
* bindings/js/JSMessagePortCustom.h:
* bindings/js/JSNodeFilterCondition.h:
* bindings/js/JavaScriptCallFrame.cpp:
* bindings/js/ScriptCallStackFactory.cpp:
* bindings/js/ScriptValue.h:
* bindings/js/SerializedScriptValue.h:
* bindings/objc/WebScriptObjectPrivate.h:
* bridge/c/c_utility.h:
* bridge/testbindings.cpp:
* bridge/testbindings.mm:
* bridge/testqtbindings.cpp:
* plugins/PluginView.cpp:
* plugins/blackberry/PluginViewBlackBerry.cpp:
* plugins/gtk/PluginViewGtk.cpp:
* plugins/mac/PluginViewMac.mm:
* plugins/qt/PluginViewQt.cpp:
* plugins/win/PluginViewWin.cpp:

Source/WebKit/gtk:

We're renaming these two files, so we have to replace the names everywhere.

* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:

Source/WebKit/mac:

We're renaming these two files, so we have to replace the names everywhere.

* DOM/WebDOMOperations.mm:
* ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h.
* ForwardingHeaders/runtime/JSValue.h: Removed.
* WebView/WebFrame.mm:
* WebView/WebView.mm:

Source/WebKit/win:

We're renaming these two files, so we have to replace the names everywhere.

* WebFrame.cpp:
* WebView.cpp:

Source/WebKit/wx:

We're renaming these two files, so we have to replace the names everywhere.

* WebFrame.cpp:
* WebView.cpp:

Source/WebKit2:

We're renaming these two files, so we have to replace the names everywhere.

* WebProcess/WebPage/WebPage.cpp:

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

117 files changed:
Source/JavaScriptCore/API/APICast.h
Source/JavaScriptCore/API/JSBlockAdaptor.mm
Source/JavaScriptCore/API/JSStringRefCF.cpp
Source/JavaScriptCore/API/JSValue.h [moved from Source/JavaScriptCore/API/APIJSValue.h with 100% similarity]
Source/JavaScriptCore/API/JSValue.mm
Source/JavaScriptCore/API/JSValueInternal.h
Source/JavaScriptCore/API/JSValueRef.cpp
Source/JavaScriptCore/API/JSWeakObjectMapRefPrivate.cpp
Source/JavaScriptCore/API/JavaScriptCore.h
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/GNUmakefile.list.am
Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/JavaScriptCore/Target.pri
Source/JavaScriptCore/bytecode/CallLinkStatus.h
Source/JavaScriptCore/bytecode/CodeBlock.cpp
Source/JavaScriptCore/bytecode/MethodOfGettingAValueProfile.h
Source/JavaScriptCore/bytecode/ResolveGlobalStatus.cpp
Source/JavaScriptCore/bytecode/ResolveGlobalStatus.h
Source/JavaScriptCore/bytecode/SpeculatedType.h
Source/JavaScriptCore/bytecode/ValueRecovery.h
Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
Source/JavaScriptCore/dfg/DFGJITCompiler.cpp
Source/JavaScriptCore/dfg/DFGNode.h
Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
Source/JavaScriptCore/heap/CopiedBlock.h
Source/JavaScriptCore/heap/HandleStack.cpp
Source/JavaScriptCore/heap/HandleTypes.h
Source/JavaScriptCore/heap/WeakImpl.h
Source/JavaScriptCore/interpreter/Interpreter.h
Source/JavaScriptCore/interpreter/Register.h
Source/JavaScriptCore/interpreter/VMInspector.h
Source/JavaScriptCore/jit/HostCallReturnValue.cpp
Source/JavaScriptCore/jit/HostCallReturnValue.h
Source/JavaScriptCore/jit/JITCode.h
Source/JavaScriptCore/jit/JITExceptions.cpp
Source/JavaScriptCore/jit/JITExceptions.h
Source/JavaScriptCore/jit/JSInterfaceJIT.h
Source/JavaScriptCore/llint/LLIntCLoop.h
Source/JavaScriptCore/llint/LLIntData.h
Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
Source/JavaScriptCore/profiler/ProfilerBytecode.h
Source/JavaScriptCore/profiler/ProfilerBytecodeSequence.h
Source/JavaScriptCore/profiler/ProfilerBytecodes.h
Source/JavaScriptCore/profiler/ProfilerCompilation.h
Source/JavaScriptCore/profiler/ProfilerCompiledBytecode.h
Source/JavaScriptCore/profiler/ProfilerDatabase.h
Source/JavaScriptCore/profiler/ProfilerOSRExit.h
Source/JavaScriptCore/profiler/ProfilerOSRExitSite.h
Source/JavaScriptCore/profiler/ProfilerOrigin.h
Source/JavaScriptCore/profiler/ProfilerOriginStack.h
Source/JavaScriptCore/runtime/ArgList.cpp
Source/JavaScriptCore/runtime/CachedTranscendentalFunction.h
Source/JavaScriptCore/runtime/CallData.h
Source/JavaScriptCore/runtime/Completion.h
Source/JavaScriptCore/runtime/ConstructData.h
Source/JavaScriptCore/runtime/DateConstructor.cpp
Source/JavaScriptCore/runtime/DateInstance.cpp
Source/JavaScriptCore/runtime/DatePrototype.cpp
Source/JavaScriptCore/runtime/JSAPIValueWrapper.h
Source/JavaScriptCore/runtime/JSCJSValue.cpp [moved from Source/JavaScriptCore/runtime/JSValue.cpp with 99% similarity]
Source/JavaScriptCore/runtime/JSCJSValue.h [moved from Source/JavaScriptCore/runtime/JSValue.h with 97% similarity]
Source/JavaScriptCore/runtime/JSCJSValueInlines.h [moved from Source/JavaScriptCore/runtime/JSValueInlines.h with 99% similarity]
Source/JavaScriptCore/runtime/JSGlobalData.h
Source/JavaScriptCore/runtime/JSGlobalObject.cpp
Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h
Source/JavaScriptCore/runtime/JSStringJoiner.h
Source/JavaScriptCore/runtime/LiteralParser.h
Source/JavaScriptCore/runtime/Operations.h
Source/JavaScriptCore/runtime/PropertyDescriptor.h
Source/JavaScriptCore/runtime/PropertySlot.h
Source/JavaScriptCore/runtime/Protect.h
Source/JavaScriptCore/runtime/RegExpPrototype.cpp
Source/JavaScriptCore/runtime/Structure.h
Source/WebCore/ChangeLog
Source/WebCore/ForwardingHeaders/runtime/JSCJSValue.h [new file with mode: 0644]
Source/WebCore/ForwardingHeaders/runtime/JSValue.h [deleted file]
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/bindings/js/JSArrayBufferViewHelper.h
Source/WebCore/bindings/js/JSCustomXPathNSResolver.h
Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
Source/WebCore/bindings/js/JSIntentConstructor.cpp
Source/WebCore/bindings/js/JSMessagePortCustom.h
Source/WebCore/bindings/js/JSNodeFilterCondition.h
Source/WebCore/bindings/js/JavaScriptCallFrame.cpp
Source/WebCore/bindings/js/ScriptCallStackFactory.cpp
Source/WebCore/bindings/js/ScriptValue.h
Source/WebCore/bindings/js/SerializedScriptValue.h
Source/WebCore/bindings/objc/WebScriptObjectPrivate.h
Source/WebCore/bridge/c/c_utility.h
Source/WebCore/bridge/testbindings.cpp
Source/WebCore/bridge/testbindings.mm
Source/WebCore/bridge/testqtbindings.cpp
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/blackberry/PluginViewBlackBerry.cpp
Source/WebCore/plugins/gtk/PluginViewGtk.cpp
Source/WebCore/plugins/mac/PluginViewMac.mm
Source/WebCore/plugins/qt/PluginViewQt.cpp
Source/WebCore/plugins/win/PluginViewWin.cpp
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/DOM/WebDOMOperations.mm
Source/WebKit/mac/ForwardingHeaders/runtime/JSCJSValue.h [new file with mode: 0644]
Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h [deleted file]
Source/WebKit/mac/WebView/WebFrame.mm
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebFrame.cpp
Source/WebKit/win/WebView.cpp
Source/WebKit/wx/ChangeLog
Source/WebKit/wx/WebFrame.cpp
Source/WebKit/wx/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebPage/WebPage.cpp

index f019a7a..c83e636 100644 (file)
@@ -27,8 +27,8 @@
 #define APICast_h
 
 #include "JSAPIValueWrapper.h"
+#include "JSCJSValue.h"
 #include "JSGlobalObject.h"
-#include "JSValue.h"
 #include <wtf/UnusedParam.h>
 
 namespace JSC {
index da9d5f1..9f970ee 100644 (file)
@@ -34,7 +34,7 @@
 #import "JSBlockAdaptor.h"
 #import "JSContextInternal.h"
 #import "JSWrapperMap.h"
-#import "JSValue.h"
+#import "JSCJSValue.h"
 #import "JSValueInternal.h"
 #import "ObjcRuntimeExtras.h"
 #import "Operations.h"
index fd72a59..724a729 100644 (file)
@@ -30,7 +30,7 @@
 #include "InitializeThreading.h"
 #include "JSStringRef.h"
 #include "OpaqueJSString.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/OwnArrayPtr.h>
 
 JSStringRef JSStringCreateWithCFString(CFStringRef string)
index 79b45c1..d368339 100644 (file)
@@ -35,7 +35,7 @@
 #import "JSWrapperMap.h"
 #import "ObjcRuntimeExtras.h"
 #import "Operations.h"
-#import "JSValue.h"
+#import "JSCJSValue.h"
 #import "wtf/HashMap.h"
 #import "wtf/HashSet.h"
 #import "wtf/Vector.h"
index 46cbb70..acab206 100644 (file)
@@ -24,7 +24,7 @@
  */
 
 #import <JavaScriptCore/JavaScriptCore.h>
-#import "APIJSValue.h"
+#import "JSValue.h"
 
 #if JS_OBJC_API_ENABLED
 
index 85038c2..d2913a9 100644 (file)
 #include "APIShims.h"
 #include "JSCallbackObject.h"
 
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSONObject.h>
 #include <runtime/JSString.h>
 #include <runtime/LiteralParser.h>
 #include <runtime/Operations.h>
 #include <runtime/Protect.h>
-#include <runtime/JSValue.h>
 
 #include <wtf/Assertions.h>
 #include <wtf/text/StringHash.h>
index e69e78e..094eee1 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "APICast.h"
 #include "APIShims.h"
+#include "JSCJSValue.h"
 #include "JSCallbackObject.h"
-#include "JSValue.h"
 #include "JSWeakObjectMapRefInternal.h"
 #include "Operations.h"
 #include <wtf/HashMap.h>
index 350b61e..26bb3f1 100644 (file)
@@ -32,7 +32,7 @@
 #if defined(__OBJC__) && JS_OBJC_API_ENABLED
 
 #import "JSContext.h"
-#import "APIJSValue.h"
+#import "JSValue.h"
 #import "JSVirtualMachine.h"
 #import "JSExport.h"
 
index 3d6672f..a378e77 100644 (file)
@@ -247,7 +247,7 @@ set(JavaScriptCore_SOURCES
     runtime/JSString.cpp
     runtime/JSStringJoiner.cpp
     runtime/JSSymbolTableObject.cpp
-    runtime/JSValue.cpp
+    runtime/JSCJSValue.cpp
     runtime/JSVariableObject.cpp
     runtime/JSWrapperObject.cpp
     runtime/LiteralParser.cpp
index 88cb1fb..5cdb49c 100644 (file)
@@ -1,3 +1,93 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * API/APICast.h:
+        * API/APIJSValue.h: Removed.
+        * API/JSBlockAdaptor.mm:
+        * API/JSStringRefCF.cpp:
+        * API/JSValue.h: Copied from Source/JavaScriptCore/API/APIJSValue.h.
+        * API/JSValue.mm:
+        * API/JSValueInternal.h:
+        * API/JSValueRef.cpp:
+        * API/JSWeakObjectMapRefPrivate.cpp:
+        * API/JavaScriptCore.h:
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * Target.pri:
+        * bytecode/CallLinkStatus.h:
+        * bytecode/CodeBlock.cpp:
+        * bytecode/MethodOfGettingAValueProfile.h:
+        * bytecode/ResolveGlobalStatus.cpp:
+        * bytecode/ResolveGlobalStatus.h:
+        * bytecode/SpeculatedType.h:
+        * bytecode/ValueRecovery.h:
+        * dfg/DFGByteCodeParser.cpp:
+        * dfg/DFGJITCompiler.cpp:
+        * dfg/DFGNode.h:
+        * dfg/DFGSpeculativeJIT.cpp:
+        * dfg/DFGSpeculativeJIT64.cpp:
+        * heap/CopiedBlock.h:
+        * heap/HandleStack.cpp:
+        * heap/HandleTypes.h:
+        * heap/WeakImpl.h:
+        * interpreter/Interpreter.h:
+        * interpreter/Register.h:
+        * interpreter/VMInspector.h:
+        * jit/HostCallReturnValue.cpp:
+        * jit/HostCallReturnValue.h:
+        * jit/JITCode.h:
+        * jit/JITExceptions.cpp:
+        * jit/JITExceptions.h:
+        * jit/JSInterfaceJIT.h:
+        * llint/LLIntCLoop.h:
+        * llint/LLIntData.h:
+        * llint/LLIntSlowPaths.cpp:
+        * profiler/ProfilerBytecode.h:
+        * profiler/ProfilerBytecodeSequence.h:
+        * profiler/ProfilerBytecodes.h:
+        * profiler/ProfilerCompilation.h:
+        * profiler/ProfilerCompiledBytecode.h:
+        * profiler/ProfilerDatabase.h:
+        * profiler/ProfilerOSRExit.h:
+        * profiler/ProfilerOSRExitSite.h:
+        * profiler/ProfilerOrigin.h:
+        * profiler/ProfilerOriginStack.h:
+        * runtime/ArgList.cpp:
+        * runtime/CachedTranscendentalFunction.h:
+        * runtime/CallData.h:
+        * runtime/Completion.h:
+        * runtime/ConstructData.h:
+        * runtime/DateConstructor.cpp:
+        * runtime/DateInstance.cpp:
+        * runtime/DatePrototype.cpp:
+        * runtime/JSAPIValueWrapper.h:
+        * runtime/JSCJSValue.cpp: Copied from Source/JavaScriptCore/runtime/JSValue.cpp.
+        * runtime/JSCJSValue.h: Copied from Source/JavaScriptCore/runtime/JSValue.h.
+        (JSValue):
+        * runtime/JSCJSValueInlines.h: Copied from Source/JavaScriptCore/runtime/JSValueInlines.h.
+        * runtime/JSGlobalData.h:
+        * runtime/JSGlobalObject.cpp:
+        * runtime/JSGlobalObjectFunctions.h:
+        * runtime/JSStringJoiner.h:
+        * runtime/JSValue.cpp: Removed.
+        * runtime/JSValue.h: Removed.
+        * runtime/JSValueInlines.h: Removed.
+        * runtime/LiteralParser.h:
+        * runtime/Operations.h:
+        * runtime/PropertyDescriptor.h:
+        * runtime/PropertySlot.h:
+        * runtime/Protect.h:
+        * runtime/RegExpPrototype.cpp:
+        * runtime/Structure.h:
+
 2013-01-23  Oliver Hunt  <oliver@apple.com>
 
         Harden JSC a bit with RELEASE_ASSERT
index fc507f3..281f545 100644 (file)
@@ -646,9 +646,9 @@ javascriptcore_sources += \
        Source/JavaScriptCore/runtime/JSSymbolTableObject.h \
        Source/JavaScriptCore/runtime/JSType.h \
        Source/JavaScriptCore/runtime/JSTypeInfo.h \
-       Source/JavaScriptCore/runtime/JSValue.cpp \
-       Source/JavaScriptCore/runtime/JSValue.h \
-       Source/JavaScriptCore/runtime/JSValueInlines.h \
+       Source/JavaScriptCore/runtime/JSCJSValue.cpp \
+       Source/JavaScriptCore/runtime/JSCJSValue.h \
+       Source/JavaScriptCore/runtime/JSCJSValueInlines.h \
        Source/JavaScriptCore/runtime/JSVariableObject.cpp \
        Source/JavaScriptCore/runtime/JSVariableObject.h \
        Source/JavaScriptCore/runtime/JSWithScope.h \
index fdd0a01..29fd95f 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\runtime\JSValue.cpp"
+                               RelativePath="..\..\runtime\JSCJSValue.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\runtime\JSValue.h"
+                               RelativePath="..\..\runtime\JSCJSValue.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\runtime\JSValueInlines.h"
+                               RelativePath="..\..\runtime\JSCJSValueInlines.h"
                                >
                        </File>
                        <File
index 0464505..4312596 100644 (file)
                147F39D2107EC37600427A48 /* JSGlobalObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14DE0D680D02431400AACCA2 /* JSGlobalObject.cpp */; };
                147F39D4107EC37600427A48 /* JSObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A3980E16E14800AF21C8 /* JSObject.cpp */; };
                147F39D5107EC37600427A48 /* JSString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC02E9B60E1842FA000F9297 /* JSString.cpp */; };
-               147F39D6107EC37600427A48 /* JSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSValue.cpp */; };
+               147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F692A8870255597D01FF60F7 /* JSCJSValue.cpp */; };
                147F39D7107EC37600427A48 /* JSVariableObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC22A39A0E16E14800AF21C8 /* JSVariableObject.cpp */; };
                14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14816E19154CC56C00B8054C /* BlockAllocator.cpp */; };
                14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 14816E1A154CC56C00B8054C /* BlockAllocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                863C6D9C1521111A00585E4E /* YarrCanonicalizeUCS2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 863C6D981521111200585E4E /* YarrCanonicalizeUCS2.cpp */; };
                8642C510151C06A90046D4EF /* RegExpCachedResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86F75EFB151C062F007C9BA3 /* RegExpCachedResult.cpp */; };
                8642C512151C083D0046D4EF /* RegExpMatchesArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86F75EFD151C062F007C9BA3 /* RegExpMatchesArray.cpp */; };
-               865A30F1135007E100CDB49E /* JSValueInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 865A30F0135007E100CDB49E /* JSValueInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               865A30F1135007E100CDB49E /* JSCJSValueInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 865A30F0135007E100CDB49E /* JSCJSValueInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };
                865F408810E7D56300947361 /* APIShims.h in Headers */ = {isa = PBXBuildFile; fileRef = 865F408710E7D56300947361 /* APIShims.h */; settings = {ATTRIBUTES = (Private, ); }; };
                866739D213BFDE710023D87C /* BigInteger.h in Headers */ = {isa = PBXBuildFile; fileRef = 866739D013BFDE710023D87C /* BigInteger.h */; };
                866739D313BFDE710023D87C /* Uint16WithFraction.h in Headers */ = {isa = PBXBuildFile; fileRef = 866739D113BFDE710023D87C /* Uint16WithFraction.h */; };
                86D3B3C410159D7F002865E7 /* RepatchBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 86D3B3C210159D7F002865E7 /* RepatchBuffer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                86DB64640F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86DB64630F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp */; };
                86E116B10FE75AC800B512BC /* CodeLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E116B00FE75AC800B512BC /* CodeLocation.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               86E3C612167BABD7006D760A /* APIJSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C606167BAB87006D760A /* APIJSValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               86E3C612167BABD7006D760A /* JSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C606167BAB87006D760A /* JSValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
                86E3C613167BABD7006D760A /* JSContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C607167BAB87006D760A /* JSContext.h */; settings = {ATTRIBUTES = (Public, ); }; };
                86E3C614167BABD7006D760A /* JSExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C60A167BAB87006D760A /* JSExport.h */; settings = {ATTRIBUTES = (Public, ); }; };
                86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E3C60F167BAB87006D760A /* JSVirtualMachine.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C4280E16F5CD00B34460 /* JSStringRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B74B0A43032800517CFC /* JSStringRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C4290E16F5CD00B34460 /* JSStringRefCF.h in Headers */ = {isa = PBXBuildFile; fileRef = 146AAB2A0B66A84900E55F16 /* JSStringRefCF.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C42A0E16F5CD00B34460 /* JSType.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB454099C2A0F00E2A24F /* JSType.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC18C42B0E16F5CD00B34460 /* JSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* JSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               BC18C42B0E16F5CD00B34460 /* JSCJSValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 14ABB36E099C076400E2A24F /* JSCJSValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1482B6EA0A4300B300517CFC /* JSValueRef.h */; settings = {ATTRIBUTES = (Public, ); }; };
                BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F252560D08DD8D004ECFFF /* JSVariableObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC18C42E0E16F5CD00B34460 /* JSWrapperObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 65C7A1720A8EAACB00FA37EA /* JSWrapperObject.h */; settings = {ATTRIBUTES = (Private, ); }; };
                14A42E3D0F4F60EE00599099 /* TimeoutChecker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeoutChecker.cpp; sourceTree = "<group>"; };
                14A42E3E0F4F60EE00599099 /* TimeoutChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeoutChecker.h; sourceTree = "<group>"; };
                14A6581A0F4E36F4000150FD /* JITStubs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITStubs.h; sourceTree = "<group>"; };
-               14ABB36E099C076400E2A24F /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
+               14ABB36E099C076400E2A24F /* JSCJSValue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSCJSValue.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>"; };
                14ABDF5E0A437FEF00ECCA01 /* JSCallbackObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackObject.cpp; sourceTree = "<group>"; };
                863C6D981521111200585E4E /* YarrCanonicalizeUCS2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YarrCanonicalizeUCS2.cpp; path = yarr/YarrCanonicalizeUCS2.cpp; sourceTree = "<group>"; };
                863C6D991521111200585E4E /* YarrCanonicalizeUCS2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YarrCanonicalizeUCS2.h; path = yarr/YarrCanonicalizeUCS2.h; sourceTree = "<group>"; };
                863C6D9A1521111200585E4E /* YarrCanonicalizeUCS2.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = YarrCanonicalizeUCS2.js; path = yarr/YarrCanonicalizeUCS2.js; sourceTree = "<group>"; };
-               865A30F0135007E100CDB49E /* JSValueInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValueInlines.h; sourceTree = "<group>"; };
+               865A30F0135007E100CDB49E /* JSCJSValueInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCJSValueInlines.h; sourceTree = "<group>"; };
                865F408710E7D56300947361 /* APIShims.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIShims.h; sourceTree = "<group>"; };
                866739D013BFDE710023D87C /* BigInteger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BigInteger.h; sourceTree = "<group>"; };
                866739D113BFDE710023D87C /* Uint16WithFraction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uint16WithFraction.h; sourceTree = "<group>"; };
                86D3B3C210159D7F002865E7 /* RepatchBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RepatchBuffer.h; sourceTree = "<group>"; };
                86DB64630F95C6FC00D7D921 /* ExecutableAllocatorFixedVMPool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExecutableAllocatorFixedVMPool.cpp; sourceTree = "<group>"; };
                86E116B00FE75AC800B512BC /* CodeLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeLocation.h; sourceTree = "<group>"; };
-               86E3C606167BAB87006D760A /* APIJSValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIJSValue.h; sourceTree = "<group>"; };
+               86E3C606167BAB87006D760A /* JSValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSValue.h; sourceTree = "<group>"; };
                86E3C607167BAB87006D760A /* JSContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSContext.h; sourceTree = "<group>"; };
                86E3C608167BAB87006D760A /* JSContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JSContext.mm; sourceTree = "<group>"; };
                86E3C609167BAB87006D760A /* JSContextInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSContextInternal.h; sourceTree = "<group>"; };
                F692A87C0255597D01FF60F7 /* RegExpObject.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = RegExpObject.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; };
-               F692A8870255597D01FF60F7 /* JSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
+               F692A8870255597D01FF60F7 /* JSCJSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCJSValue.cpp; sourceTree = "<group>"; tabWidth = 8; };
                FE20CE9B15F04A9500DF3430 /* LLIntCLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLIntCLoop.cpp; path = llint/LLIntCLoop.cpp; sourceTree = "<group>"; };
                FE20CE9C15F04A9500DF3430 /* LLIntCLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntCLoop.h; path = llint/LLIntCLoop.h; sourceTree = "<group>"; };
                FE4A331D15BD2E07006F54F3 /* VMInspector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VMInspector.cpp; sourceTree = "<group>"; };
                        isa = PBXGroup;
                        children = (
                                1482B78A0A4305AB00517CFC /* APICast.h */,
-                               86E3C606167BAB87006D760A /* APIJSValue.h */,
+                               86E3C606167BAB87006D760A /* JSValue.h */,
                                865F408710E7D56300947361 /* APIShims.h */,
                                1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */,
                                1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */,
                                0F919D0A157EE09D004A4E7D /* JSSymbolTableObject.h */,
                                14ABB454099C2A0F00E2A24F /* JSType.h */,
                                6507D2970E871E4A00D7D896 /* JSTypeInfo.h */,
-                               F692A8870255597D01FF60F7 /* JSValue.cpp */,
-                               14ABB36E099C076400E2A24F /* JSValue.h */,
-                               865A30F0135007E100CDB49E /* JSValueInlines.h */,
+                               F692A8870255597D01FF60F7 /* JSCJSValue.cpp */,
+                               14ABB36E099C076400E2A24F /* JSCJSValue.h */,
+                               865A30F0135007E100CDB49E /* JSCJSValueInlines.h */,
                                BC22A39A0E16E14800AF21C8 /* JSVariableObject.cpp */,
                                14F252560D08DD8D004ECFFF /* JSVariableObject.h */,
                                1442565F15EDE98D0066A49B /* JSWithScope.cpp */,
                                860161E30F3A83C100F84710 /* AbstractMacroAssembler.h in Headers */,
                                0F55F0F514D1063C00AC7649 /* AbstractPC.h in Headers */,
                                BC18C3E50E16F5CD00B34460 /* APICast.h in Headers */,
-                               86E3C612167BABD7006D760A /* APIJSValue.h in Headers */,
+                               86E3C612167BABD7006D760A /* JSValue.h in Headers */,
                                865F408810E7D56300947361 /* APIShims.h in Headers */,
                                BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
                                BC257DE80E1F51C50016B6C9 /* Arguments.h in Headers */,
                                0F919D0D157EE0A2004A4E7D /* JSSymbolTableObject.h in Headers */,
                                BC18C42A0E16F5CD00B34460 /* JSType.h in Headers */,
                                6507D29E0E871E5E00D7D896 /* JSTypeInfo.h in Headers */,
-                               BC18C42B0E16F5CD00B34460 /* JSValue.h in Headers */,
-                               865A30F1135007E100CDB49E /* JSValueInlines.h in Headers */,
+                               BC18C42B0E16F5CD00B34460 /* JSCJSValue.h in Headers */,
+                               865A30F1135007E100CDB49E /* JSCJSValueInlines.h in Headers */,
                                86E3C61B167BABEE006D760A /* JSValueInternal.h in Headers */,
                                BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */,
                                BC18C42D0E16F5CD00B34460 /* JSVariableObject.h in Headers */,
                                1482B74E0A43032800517CFC /* JSStringRef.cpp in Sources */,
                                146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
                                0F919D0C157EE09F004A4E7D /* JSSymbolTableObject.cpp in Sources */,
-                               147F39D6107EC37600427A48 /* JSValue.cpp in Sources */,
+                               147F39D6107EC37600427A48 /* JSCJSValue.cpp in Sources */,
                                86E3C61A167BABEE006D760A /* JSValue.mm in Sources */,
                                14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
                                147F39D7107EC37600427A48 /* JSVariableObject.cpp in Sources */,
index 882acee..aaf6c17 100644 (file)
@@ -266,7 +266,7 @@ SOURCES += \
     runtime/JSString.cpp \
     runtime/JSStringJoiner.cpp \
     runtime/JSSymbolTableObject.cpp \
-    runtime/JSValue.cpp \
+    runtime/JSCJSValue.cpp \
     runtime/JSVariableObject.cpp \
     runtime/JSWrapperObject.cpp \
     runtime/LiteralParser.cpp \
index 9511060..888e56e 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "CodeSpecializationKind.h"
 #include "Intrinsic.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index a3bc2bb..dda578d 100644 (file)
@@ -41,9 +41,9 @@
 #include "JIT.h"
 #include "JITStubs.h"
 #include "JSActivation.h"
+#include "JSCJSValue.h"
 #include "JSFunction.h"
 #include "JSNameScope.h"
-#include "JSValue.h"
 #include "LowLevelInterpreter.h"
 #include "Operations.h"
 #include "ReduceWhitespace.h"
index 0f5c2be..c6fe6c5 100644 (file)
@@ -34,7 +34,7 @@
 // these #if's will disappear...
 #if ENABLE(DFG_JIT)
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index 0cee38d..37d83c9 100644 (file)
@@ -27,7 +27,7 @@
 #include "ResolveGlobalStatus.h"
 
 #include "CodeBlock.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "Operations.h"
 #include "Structure.h"
 
index 46a9254..6763ff7 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ResolveGlobalStatus_h
 #define ResolveGlobalStatus_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "PropertyOffset.h"
 #include <wtf/NotFound.h>
 
index 261a26b..5300c82 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef SpeculatedType_h
 #define SpeculatedType_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index e656e57..77d5a10 100644 (file)
@@ -27,7 +27,7 @@
 #define ValueRecovery_h
 
 #include "DataFormat.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "MacroAssembler.h"
 #include "VirtualRegister.h"
 #include <stdio.h>
index 99cd665..d0c49aa 100644 (file)
@@ -35,7 +35,7 @@
 #include "DFGArrayMode.h"
 #include "DFGCapabilities.h"
 #include "GetByIdStatus.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
 #include "PutByIdStatus.h"
 #include "ResolveGlobalStatus.h"
 #include <wtf/HashMap.h>
index 2842599..827d7ad 100644 (file)
@@ -35,8 +35,8 @@
 #include "DFGSlowPathGenerator.h"
 #include "DFGSpeculativeJIT.h"
 #include "DFGThunks.h"
+#include "JSCJSValueInlines.h"
 #include "JSGlobalData.h"
-#include "JSValueInlines.h"
 #include "LinkBuffer.h"
 
 namespace JSC { namespace DFG {
index 8862bac..2aa7216 100644 (file)
@@ -39,7 +39,7 @@
 #include "DFGNodeFlags.h"
 #include "DFGNodeType.h"
 #include "DFGVariableAccessData.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "Operands.h"
 #include "SpeculatedType.h"
 #include "StructureSet.h"
index 67ae9c4..12178ad 100644 (file)
@@ -32,7 +32,7 @@
 #include "DFGArrayifySlowPathGenerator.h"
 #include "DFGCallArrayAllocatorSlowPathGenerator.h"
 #include "DFGSlowPathGenerator.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
 #include "LinkBuffer.h"
 
 namespace JSC { namespace DFG {
index 79fedda..7634ad6 100644 (file)
@@ -32,7 +32,7 @@
 #include "ArrayPrototype.h"
 #include "DFGCallArrayAllocatorSlowPathGenerator.h"
 #include "DFGSlowPathGenerator.h"
-#include "JSValueInlines.h"
+#include "JSCJSValueInlines.h"
 #include "ObjectPrototype.h"
 
 namespace JSC { namespace DFG {
index bd5784b..66083a6 100644 (file)
@@ -29,7 +29,7 @@
 #include "BlockAllocator.h"
 #include "CopyWorkList.h"
 #include "HeapBlock.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "Options.h"
 #include <wtf/Atomics.h>
 #include <wtf/OwnPtr.h>
index a5653c7..39d18f8 100644 (file)
@@ -27,8 +27,8 @@
 #include "HandleStack.h"
 
 #include "HeapRootVisitor.h"
+#include "JSCJSValueInlines.h"
 #include "JSObject.h"
-#include "JSValueInlines.h"
 
 namespace JSC {
 
index bdfbcfd..42a267e 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef HandleTypes_h
 #define HandleTypes_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index 9924923..9e38aa5 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef WeakImpl_h
 #define WeakImpl_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index c3bca1a..eb080d1 100644 (file)
@@ -31,9 +31,9 @@
 #define Interpreter_h
 
 #include "ArgList.h"
+#include "JSCJSValue.h"
 #include "JSCell.h"
 #include "JSFunction.h"
-#include "JSValue.h"
 #include "JSObject.h"
 #include "JSStack.h"
 #include "LLIntData.h"
index f056a1c..bc23356 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef Register_h
 #define Register_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/Assertions.h>
 #include <wtf/VectorTraits.h>
 
index 81ca26c..6623068 100644 (file)
@@ -29,7 +29,7 @@
 #define ENABLE_VMINSPECTOR 0
 
 #include "CallFrame.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <wtf/text/WTFString.h>
index 967c499..528fb2b 100644 (file)
@@ -27,9 +27,9 @@
 #include "HostCallReturnValue.h"
 
 #include "CallFrame.h"
-#include <wtf/InlineASM.h>
+#include "JSCJSValueInlines.h"
 #include "JSObject.h"
-#include "JSValueInlines.h"
+#include <wtf/InlineASM.h>
 
 
 namespace JSC {
index 3f61179..f4c8bc7 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef HostCallReturnValue_h
 #define HostCallReturnValue_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "MacroAssemblerCodeRef.h"
 #include <wtf/Platform.h>
 
index 78ae8ae..d55ac0b 100644 (file)
@@ -30,7 +30,7 @@
 #include "CallFrame.h"
 #include "Disassembler.h"
 #include "JITStubs.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "LegacyProfiler.h"
 #include "MacroAssemblerCodeRef.h"
 #endif
index c29e150..05ace83 100644 (file)
@@ -29,8 +29,8 @@
 #include "CallFrame.h"
 #include "CodeBlock.h"
 #include "Interpreter.h"
+#include "JSCJSValue.h"
 #include "JSGlobalData.h"
-#include "JSValue.h"
 #include "Operations.h"
 
 #if ENABLE(JIT) || ENABLE(LLINT)
index 1555f95..6921fe1 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JITExceptions_h
 #define JITExceptions_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "MacroAssemblerCodeRef.h"
 
 #if ENABLE(JIT) || ENABLE(LLINT)
index 2f4b4e3..7fdeaf0 100644 (file)
@@ -29,9 +29,9 @@
 #include "BytecodeConventions.h"
 #include "JITCode.h"
 #include "JITStubs.h"
+#include "JSCJSValue.h"
 #include "JSStack.h"
 #include "JSString.h"
-#include "JSValue.h"
 #include "MacroAssembler.h"
 #include <wtf/AlwaysInline.h>
 #include <wtf/Vector.h>
index 3a9c77b..231e52f 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(LLINT_C_LOOP)
 
 #include "CodeSpecializationKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "MacroAssemblerCodeRef.h"
 #include "Opcode.h"
 #include "Register.h"
index 3b3b602..c04bebb 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef LLIntData_h
 #define LLIntData_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "Opcode.h"
 #include <wtf/Platform.h>
 
index 2cc1ed4..a69fec6 100644 (file)
 #include "JIT.h"
 #include "JITDriver.h"
 #include "JSActivation.h"
+#include "JSCJSValue.h"
 #include "JSGlobalObjectFunctions.h"
 #include "JSNameScope.h"
 #include "JSPropertyNameIterator.h"
 #include "JSString.h"
-#include "JSValue.h"
 #include "JSWithScope.h"
 #include "LLIntCommon.h"
 #include "LLIntExceptions.h"
index 57ae702..8e99c9a 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerBytecode_h
 #define ProfilerBytecode_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "Opcode.h"
 #include <wtf/text/CString.h>
 
index 2c99941..1d5c82a 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerBytecodeSequence_h
 #define ProfilerBytecodeSequence_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerBytecode.h"
 #include <wtf/PrintStream.h>
 #include <wtf/Vector.h>
index 96edcd5..47d856c 100644 (file)
@@ -27,7 +27,7 @@
 #define ProfilerBytecodes_h
 
 #include "CodeBlockHash.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerBytecodeSequence.h"
 #include <wtf/PrintStream.h>
 #include <wtf/text/WTFString.h>
index 70b8edc..607060e 100644 (file)
@@ -27,7 +27,7 @@
 #define ProfilerCompilation_h
 
 #include "ExitKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerCompilationKind.h"
 #include "ProfilerCompiledBytecode.h"
 #include "ProfilerExecutionCounter.h"
index 2bedf05..8404444 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerCompiledBytecode_h
 #define ProfilerCompiledBytecode_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerOriginStack.h"
 #include <wtf/text/CString.h>
 
index e82f751..8d8dcff 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerDatabase_h
 #define ProfilerDatabase_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerBytecodes.h"
 #include "ProfilerCompilation.h"
 #include "ProfilerCompilationKind.h"
index b96d1d6..2a23d0b 100644 (file)
@@ -27,7 +27,7 @@
 #define ProfilerOSRExit_h
 
 #include "ExitKind.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerOriginStack.h"
 
 namespace JSC { namespace Profiler {
index 0580de6..fa418e9 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerOSRExitSite_h
 #define ProfilerOSRExitSite_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/Vector.h>
 
 namespace JSC { namespace Profiler {
index 7d160f4..09b3884 100644 (file)
@@ -27,7 +27,7 @@
 #define ProfilerOrigin_h
 
 #include "CodeBlockHash.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/HashMap.h>
 #include <wtf/PrintStream.h>
 
index c680879..415e8d9 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef ProfilerOriginStack_h
 #define ProfilerOriginStack_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "ProfilerOrigin.h"
 #include <wtf/HashMap.h>
 #include <wtf/PrintStream.h>
index 194e515..7424041 100644 (file)
@@ -22,7 +22,7 @@
 #include "ArgList.h"
 
 #include "HeapRootVisitor.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "JSObject.h"
 #include "Operations.h"
 
index 62a01db..392d64f 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef CachedTranscendentalFunction_h
 #define CachedTranscendentalFunction_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index 7df36c7..3bbac73 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef CallData_h
 #define CallData_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index d150fce..5cc2d32 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef Completion_h
 #define Completion_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index 6426b04..10317a2 100644 (file)
@@ -30,7 +30,7 @@
 #define ConstructData_h
 
 #include "CallData.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index 6c8ae88..7e78211 100644 (file)
 #include "DateConversion.h"
 #include "DateInstance.h"
 #include "DatePrototype.h"
+#include "JSCJSValueInlines.h"
 #include "JSDateMath.h"
 #include "JSFunction.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
 #include "JSStringBuilder.h"
-#include "JSValueInlines.h"
 #include "ObjectPrototype.h"
 #include <math.h>
 #include <time.h>
index bde416e..9df8220 100644 (file)
@@ -22,9 +22,9 @@
 #include "config.h"
 #include "DateInstance.h"
 
+#include "JSCJSValueInlines.h"
 #include "JSDateMath.h"
 #include "JSGlobalObject.h"
-#include "JSValueInlines.h"
 #include <math.h>
 #include <wtf/MathExtras.h>
 
index 2ec7bd4..24d1140 100644 (file)
 #include "DateConversion.h"
 #include "DateInstance.h"
 #include "Error.h"
+#include "JSCJSValueInlines.h"
 #include "JSDateMath.h"
 #include "JSGlobalObject.h"
 #include "JSString.h"
 #include "JSStringBuilder.h"
-#include "JSValueInlines.h"
 #include "Lookup.h"
 #include "ObjectPrototype.h"
 
index 21d7b21..73965e8 100644 (file)
@@ -23,8 +23,8 @@
 #ifndef JSAPIValueWrapper_h
 #define JSAPIValueWrapper_h
 
+#include "JSCJSValue.h"
 #include "JSCell.h"
-#include "JSValue.h"
 #include "CallFrame.h"
 #include "Structure.h"
 
similarity index 99%
rename from Source/JavaScriptCore/runtime/JSValue.cpp
rename to Source/JavaScriptCore/runtime/JSCJSValue.cpp
index 846ddbc..8d56582 100644 (file)
  */
 
 #include "config.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 #include "BooleanConstructor.h"
 #include "BooleanPrototype.h"
 #include "Error.h"
 #include "ExceptionHelpers.h"
 #include "GetterSetter.h"
-#include "JSGlobalObject.h"
+#include "JSCJSValueInlines.h"
 #include "JSFunction.h"
+#include "JSGlobalObject.h"
 #include "JSNotAnObject.h"
-#include "JSValueInlines.h"
 #include "NumberObject.h"
 #include <wtf/MathExtras.h>
 #include <wtf/StringExtras.h>
similarity index 97%
rename from Source/JavaScriptCore/runtime/JSValue.h
rename to Source/JavaScriptCore/runtime/JSCJSValue.h
index 602b0c6..1c58df2 100644 (file)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef JSValue_h
-#define JSValue_h
+#ifndef JSCJSValue_h
+#define JSCJSValue_h
 
 #include <math.h>
 #include <stddef.h> // for size_t
@@ -245,12 +245,12 @@ public:
 
     JSObject* toThisObject(ExecState*) const;
 
-    static bool equal(ExecState* exec, JSValue v1, JSValue v2);
-    static bool equalSlowCase(ExecState* exec, JSValue v1, JSValue v2);
-    static bool equalSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2);
-    static bool strictEqual(ExecState* exec, JSValue v1, JSValue v2);
-    static bool strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2);
-    static bool strictEqualSlowCaseInline(ExecState* exec, JSValue v1, JSValue v2);
+    static bool equal(ExecState*, JSValue v1, JSValue v2);
+    static bool equalSlowCase(ExecState*, JSValue v1, JSValue v2);
+    static bool equalSlowCaseInline(ExecState*, JSValue v1, JSValue v2);
+    static bool strictEqual(ExecState*, JSValue v1, JSValue v2);
+    static bool strictEqualSlowCase(ExecState*, JSValue v1, JSValue v2);
+    static bool strictEqualSlowCaseInline(ExecState*, JSValue v1, JSValue v2);
 
     bool isCell() const;
     JSCell* asCell() const;
@@ -494,4 +494,4 @@ inline bool operator!=(const JSCell* a, const JSValue b) { return JSValue(a) !=
 
 } // namespace JSC
 
-#endif // JSValue_h
+#endif // JSCJSValue_h
@@ -27,9 +27,9 @@
 #define JSValueInlines_h
 
 #include "InternalFunction.h"
+#include "JSCJSValue.h"
 #include "JSCellInlines.h"
 #include "JSFunction.h"
-#include "JSValue.h"
 
 namespace JSC {
 
index 3b02dc9..d85cfb2 100644 (file)
@@ -36,8 +36,8 @@
 #include "Intrinsic.h"
 #include "JITThunks.h"
 #include "JITThunks.h"
+#include "JSCJSValue.h"
 #include "JSLock.h"
-#include "JSValue.h"
 #include "LLIntData.h"
 #include "NumericStrings.h"
 #include "ProfilerDatabase.h"
index cb6747b..a509ecb 100644 (file)
@@ -49,6 +49,7 @@
 #include "Interpreter.h"
 #include "JSActivation.h"
 #include "JSBoundFunction.h"
+#include "JSCJSValueInlines.h"
 #include "JSCallbackConstructor.h"
 #include "JSCallbackFunction.h"
 #include "JSCallbackObject.h"
@@ -57,7 +58,6 @@
 #include "JSLock.h"
 #include "JSNameScope.h"
 #include "JSONObject.h"
-#include "JSValueInlines.h"
 #include "JSWithScope.h"
 #include "LegacyProfiler.h"
 #include "Lookup.h"
index 757c9dc..c2b4a1b 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef JSGlobalObjectFunctions_h
 #define JSGlobalObjectFunctions_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/unicode/Unicode.h>
 
 namespace JSC {
index 5cb841a..6340cbf 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JSStringJoiner_h
 #define JSStringJoiner_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
index c0f308e..fac9757 100644 (file)
@@ -27,8 +27,8 @@
 #define LiteralParser_h
 
 #include "Identifier.h"
+#include "JSCJSValue.h"
 #include "JSGlobalObjectFunctions.h"
-#include "JSValue.h"
 #include <wtf/text/WTFString.h>
 
 namespace JSC {
index a901d3e..15c78b9 100644 (file)
@@ -24,9 +24,9 @@
 
 #include "ExceptionHelpers.h"
 #include "Interpreter.h"
+#include "JSCJSValueInlines.h"
 #include "JSProxy.h"
 #include "JSString.h"
-#include "JSValueInlines.h"
 
 namespace JSC {
 
index 2c3878f..5a5857d 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef PropertyDescriptor_h
 #define PropertyDescriptor_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
     class GetterSetter;
index c673eaa..6fb80d2 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef PropertySlot_h
 #define PropertySlot_h
 
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #include "PropertyName.h"
 #include "PropertyOffset.h"
 #include "Register.h"
index 843c9e1..78dd319 100644 (file)
@@ -23,7 +23,7 @@
 #define Protect_h
 
 #include "Heap.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 
 namespace JSC {
 
index a14b375..d980171 100644 (file)
 #include "ArrayPrototype.h"
 #include "Error.h"
 #include "JSArray.h"
+#include "JSCJSValue.h"
 #include "JSFunction.h"
 #include "JSObject.h"
 #include "JSString.h"
 #include "JSStringBuilder.h"
-#include "JSValue.h"
 #include "ObjectPrototype.h"
 #include "Operations.h"
 #include "RegExpObject.h"
index 6dca9b1..8b2fb7b 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "ClassInfo.h"
 #include "IndexingType.h"
+#include "JSCJSValue.h"
 #include "JSCell.h"
 #include "JSType.h"
-#include "JSValue.h"
 #include "PropertyMapHashTable.h"
 #include "PropertyName.h"
 #include "PropertyNameArray.h"
index fca70d1..269f4e3 100644 (file)
@@ -1,3 +1,39 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        No new tests.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebCore/ForwardingHeaders/runtime/JSValue.h.
+        * ForwardingHeaders/runtime/JSValue.h: Removed.
+        * WebCore.vcproj/WebCore.vcproj:
+        * bindings/js/JSArrayBufferViewHelper.h:
+        * bindings/js/JSCustomXPathNSResolver.h:
+        * bindings/js/JSHTMLAllCollectionCustom.cpp:
+        * bindings/js/JSIntentConstructor.cpp:
+        * bindings/js/JSMessagePortCustom.h:
+        * bindings/js/JSNodeFilterCondition.h:
+        * bindings/js/JavaScriptCallFrame.cpp:
+        * bindings/js/ScriptCallStackFactory.cpp:
+        * bindings/js/ScriptValue.h:
+        * bindings/js/SerializedScriptValue.h:
+        * bindings/objc/WebScriptObjectPrivate.h:
+        * bridge/c/c_utility.h:
+        * bridge/testbindings.cpp:
+        * bridge/testbindings.mm:
+        * bridge/testqtbindings.cpp:
+        * plugins/PluginView.cpp:
+        * plugins/blackberry/PluginViewBlackBerry.cpp:
+        * plugins/gtk/PluginViewGtk.cpp:
+        * plugins/mac/PluginViewMac.mm:
+        * plugins/qt/PluginViewQt.cpp:
+        * plugins/win/PluginViewWin.cpp:
+
 2013-01-24  Jer Noble  <jer.noble@apple.com>
 
         Unreviewed build fix for Mac/Lion.
diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSCJSValue.h b/Source/WebCore/ForwardingHeaders/runtime/JSCJSValue.h
new file mode 100644 (file)
index 0000000..1e961d4
--- /dev/null
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_JSCJSValue_h
+#define WebCore_FWD_JSCJSValue_h
+#include <JavaScriptCore/JSCJSValue.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/runtime/JSValue.h b/Source/WebCore/ForwardingHeaders/runtime/JSValue.h
deleted file mode 100644 (file)
index d4c21ca..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_JSValue_h
-#define WebCore_FWD_JSValue_h
-#include <JavaScriptCore/JSValue.h>
-#endif
index ab0ef2b..bfe5630 100755 (executable)
                                        >
                                </File>
                                <File
-                                       RelativePath="..\ForwardingHeaders\runtime\JSValue.h"
+                                       RelativePath="..\ForwardingHeaders\runtime\JSCJSValue.h"
                                        >
                                </File>
                                <File
index 3d79a1d..5421e9a 100644 (file)
@@ -33,8 +33,8 @@
 #include <interpreter/CallFrame.h>
 #include <runtime/ArgList.h>
 #include <runtime/Error.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSObject.h>
-#include <runtime/JSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/ArrayBufferView.h>
 #include <wtf/TypedArrayBase.h>
index 538d3ac..7e218e8 100644 (file)
@@ -29,7 +29,7 @@
 #include "XPathNSResolver.h"
 #include <heap/Strong.h>
 #include <heap/StrongInlines.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/Forward.h>
 #include <wtf/RefPtr.h>
index 10dc069..6dafc31 100644 (file)
@@ -32,7 +32,7 @@
 #include "JSNodeList.h"
 #include "Node.h"
 #include "StaticNodeList.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/Vector.h>
 #include <wtf/text/AtomicString.h>
 
index 4f29c74..9e76368 100644 (file)
 
 #include "Dictionary.h"
 #include "ExceptionCode.h"
+#include "JSCJSValue.h"
 #include "JSDOMBinding.h"
 #include "JSIntent.h"
 #include "JSMessagePortCustom.h"
-#include "JSValue.h"
 #include <runtime/Error.h>
 #include <wtf/ArrayBuffer.h>
 
index 5feee9c..bbd5662 100644 (file)
@@ -32,7 +32,7 @@
 #define JSMessagePortCustom_h
 
 #include "MessagePort.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/Forward.h>
 
index 7c571a2..7079b22 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "NodeFilterCondition.h"
 #include <heap/Weak.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/PassRefPtr.h>
 
index 45e3b68..00f0990 100644 (file)
 #include "JSDOMWindowBase.h"
 #include <debugger/DebuggerCallFrame.h>
 #include <runtime/Completion.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
 #include <runtime/JSObject.h>
-#include <runtime/JSValue.h>
 #include <wtf/text/WTFString.h>
 
 using namespace JSC;
index 193f64f..2600c33 100644 (file)
@@ -42,9 +42,9 @@
 #include <interpreter/CallFrame.h>
 #include <interpreter/Interpreter.h>
 #include <runtime/ArgList.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSFunction.h>
 #include <runtime/JSGlobalData.h>
-#include <runtime/JSValue.h>
 #include <wtf/text/WTFString.h>
 
 using namespace JSC;
index 2b35220..2cc4902 100644 (file)
@@ -35,7 +35,7 @@
 #include "ScriptState.h"
 #include <heap/Strong.h>
 #include <heap/StrongInlines.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/WTFString.h>
index a68717d..6005b12 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "ScriptState.h"
 #include <heap/Strong.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/ArrayBuffer.h>
 #include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
index 5da1dde..a286ac3 100644 (file)
@@ -27,7 +27,7 @@
 #define _WEB_SCRIPT_OBJECT_PRIVATE_H_
 
 #import "WebScriptObject.h"
-#import <runtime/JSValue.h>
+#import <runtime/JSCJSValue.h>
 #import <wtf/PassRefPtr.h>
 
 namespace JSC {
index 4468f34..7901d73 100644 (file)
@@ -29,7 +29,7 @@
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
 #include "npruntime_internal.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/Operations.h>
 #include <wtf/Forward.h>
 
index b43b75d..95730c4 100644 (file)
@@ -21,8 +21,8 @@
 #include "config.h"
 
 #include "BridgeJSC.h"
+#include "JSCJSValue.h"
 #include "JSObject.h"
-#include "JSValue.h"
 #include "interpreter.h"
 #include "npruntime_internal.h"
 #include "runtime_object.h"
index e50f16a..78fcc33 100644 (file)
@@ -28,7 +28,7 @@
 #include "BridgeJSC.h"
 #include <Foundation/Foundation.h>
 #include "JSObject.h"
-#include "JSValue.h"
+#include "JSCJSValue.h"
 #import <WebKit/WebScriptObject.h>
 #include "interpreter.h"
 #include "runtime_object.h"
index 7d3d416..c250c99 100644 (file)
@@ -25,8 +25,8 @@
 #include "config.h"
 
 #include "BridgeJSC.h"
+#include "JSCJSValue.h"
 #include "JSObject.h"
-#include "JSValue.h"
 #include "interpreter.h"
 #include "qdebug.h"
 #include "qobject.h"
index 8a31103..7d92bec 100644 (file)
@@ -76,8 +76,8 @@
 #include "JSDOMWindow.h"
 #include "c_instance.h"
 #include "runtime_root.h"
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 
 using JSC::ExecState;
 using JSC::JSLock;
index f2ed311..fa9d662 100644 (file)
@@ -67,8 +67,8 @@
 #include <BlackBerryPlatformIntRectRegion.h>
 #include <BlackBerryPlatformWindow.h>
 
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 #include <sys/keycodes.h>
 #include <vector>
 
index 2e67bc6..be45d05 100644 (file)
@@ -62,8 +62,8 @@
 #include "JSDOMBinding.h"
 #include "npruntime_impl.h"
 #include "runtime_root.h"
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 
 #ifdef GTK_API_VERSION_2
 #include <gdkconfig.h>
index 849a57f..9d3eab3 100644 (file)
@@ -62,7 +62,7 @@
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/RetainPtr.h>
 
 
index 579ed03..de5c2b8 100644 (file)
@@ -76,8 +76,8 @@
 #define Status int
 #include <X11/extensions/Xrender.h>
 #endif
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 
 #include "QtX11ImageConversion.h"
 #include <QGuiApplication>
index bd14cd9..e0934cb 100644 (file)
@@ -66,8 +66,8 @@
 #include "c_instance.h"
 #include "npruntime_impl.h"
 #include "runtime_root.h"
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 #include <wtf/ASCIICType.h>
 #include <wtf/text/WTFString.h>
 
index 7732922..0208361 100644 (file)
@@ -1,3 +1,14 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+
 2013-01-23  Manuel Rego Casasnovas  <rego@igalia.com>
 
         [GTK] Avoid reset title for navigation within the page
index 007061e..cb50005 100644 (file)
 #include "GeolocationPosition.h"
 #include "GraphicsContext.h"
 #include "HTMLInputElement.h"
+#include "JSCJSValue.h"
 #include "JSCSSStyleDeclaration.h"
 #include "JSDOMWindow.h"
 #include "JSDocument.h"
 #include "JSElement.h"
 #include "JSLock.h"
 #include "JSNodeList.h"
-#include "JSValue.h"
 #include "MemoryCache.h"
 #include "MutationObserver.h"
 #include "NodeList.h"
index 4b15fca..5bfb5fa 100644 (file)
@@ -1,3 +1,18 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * DOM/WebDOMOperations.mm:
+        * ForwardingHeaders/runtime/JSCJSValue.h: Copied from Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h.
+        * ForwardingHeaders/runtime/JSValue.h: Removed.
+        * WebView/WebFrame.mm:
+        * WebView/WebView.mm:
+
 2013-01-22  Anders Carlsson  <andersca@apple.com>
 
         Use a platforom strategy for local storage
index aaa7a70..8197fd2 100644 (file)
@@ -51,7 +51,7 @@
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMHTML.h>
 #import <runtime/JSLock.h>
-#import <runtime/JSValue.h>
+#import <runtime/JSCJSValue.h>
 #import <wtf/Assertions.h>
 
 using namespace WebCore;
diff --git a/Source/WebKit/mac/ForwardingHeaders/runtime/JSCJSValue.h b/Source/WebKit/mac/ForwardingHeaders/runtime/JSCJSValue.h
new file mode 100644 (file)
index 0000000..c19372f
--- /dev/null
@@ -0,0 +1 @@
+#import <JavaScriptCore/JSCJSValue.h>
diff --git a/Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h b/Source/WebKit/mac/ForwardingHeaders/runtime/JSValue.h
deleted file mode 100644 (file)
index 4f49f83..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#import <JavaScriptCore/JSValue.h>
index c66d446..6c122fd 100644 (file)
@@ -97,7 +97,7 @@
 #import <WebKitSystemInterface.h>
 #import <runtime/JSLock.h>
 #import <runtime/JSObject.h>
-#import <runtime/JSValue.h>
+#import <runtime/JSCJSValue.h>
 #import <wtf/CurrentTime.h>
 
 using namespace std;
index b5ea420..626f4b3 100644 (file)
 #import <runtime/DateInstance.h>
 #import <runtime/InitializeThreading.h>
 #import <runtime/JSLock.h>
-#import <runtime/JSValue.h>
+#import <runtime/JSCJSValue.h>
 #import <wtf/Assertions.h>
 #import <wtf/HashTraits.h>
 #import <wtf/MainThread.h>
index 7029c85..9e22990 100644 (file)
@@ -1,3 +1,15 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * WebFrame.cpp:
+        * WebView.cpp:
+
 2013-01-23  Tony Chang  <tony@chromium.org>
 
         Unreviewed, set svn:eol-style to CRLF on Windows .sln files.
index 0fac382..846ffc3 100644 (file)
 #include <WebCore/ScriptValue.h>
 #include <WebCore/SecurityOrigin.h>
 #include <JavaScriptCore/APICast.h>
+#include <JavaScriptCore/JSCJSValue.h>
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSObject.h>
-#include <JavaScriptCore/JSValue.h>
 #include <wtf/MathExtras.h>
 
 #if USE(CG)
index ca6426a..c7e76d3 100644 (file)
@@ -64,8 +64,8 @@
 #include "resource.h"
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/InitializeThreading.h>
+#include <JavaScriptCore/JSCJSValue.h>
 #include <JavaScriptCore/JSLock.h>
-#include <JavaScriptCore/JSValue.h>
 #include <WebCore/AXObjectCache.h>
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/BString.h>
index 972eb59..5dc18a7 100644 (file)
@@ -1,3 +1,15 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * WebFrame.cpp:
+        * WebView.cpp:
+
 2013-01-08  Mark Lam  <mark.lam@apple.com>
 
         Removed the need for the ProposedDatabase mechanism.
index ccf54e3..d8fac61 100644 (file)
@@ -53,7 +53,7 @@
 #include "TextEncoding.h"
 
 #include "JSDOMBinding.h"
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index 94c569c..f70174a 100644 (file)
@@ -70,7 +70,7 @@
 #include "ScriptController.h"
 #include "JSDOMBinding.h"
 #include <runtime/InitializeThreading.h>
-#include <runtime/JSValue.h>
+#include <runtime/JSCJSValue.h>
 #include <wtf/MainThread.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
index 186b8c9..294cc51 100644 (file)
@@ -1,3 +1,14 @@
+2013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        Objective-C API: Rename JSValue.h/APIJSValue.h to JSCJSValue.h/JSValue.h
+        https://bugs.webkit.org/show_bug.cgi?id=107327
+
+        Reviewed by Filip Pizlo.
+
+        We're renaming these two files, so we have to replace the names everywhere.
+
+        * WebProcess/WebPage/WebPage.cpp:
+
 2013-01-24  Dean Jackson  <dino@apple.com>
 
         Allow some plugin snapshot UI content to come from Injected Bundle
index ca83388..98e37c5 100644 (file)
 #include <WebCore/TextIterator.h>
 #include <WebCore/VisiblePosition.h>
 #include <WebCore/markup.h>
+#include <runtime/JSCJSValue.h>
 #include <runtime/JSLock.h>
-#include <runtime/JSValue.h>
 #include <runtime/Operations.h>
 
 #if ENABLE(MHTML)