Reviewed by Sam.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 02:14:41 +0000 (02:14 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Mar 2008 02:14:41 +0000 (02:14 +0000)
        Update include paths. This code is not used yet.

        * bridge/NP_jsobject.cpp:
        * bridge/c/c_class.cpp:
        * bridge/c/c_instance.cpp:
        * bridge/c/c_utility.cpp:
        (KJS::Bindings::convertUTF8ToUTF16WithLatin1Fallback):
        #if 0 this out for now.

        * bridge/jni/jni_class.cpp:
        * bridge/jni/jni_jsobject.cpp:
        * bridge/jni/jni_objc.mm:
        * bridge/jni/jni_runtime.cpp:
        * bridge/jni/jni_utility.cpp:
        * bridge/jni/jni_utility.h:
        * bridge/npruntime.cpp:
        * bridge/objc/WebScriptObject.h:
        * bridge/objc/objc_class.h:
        * bridge/objc/objc_instance.h:
        * bridge/objc/objc_runtime.h:
        * bridge/objc/objc_utility.h:
        * bridge/objc/objc_utility.mm:
        * bridge/runtime.cpp:
        * bridge/runtime.h:
        * bridge/runtime_array.cpp:
        * bridge/runtime_array.h:
        * bridge/runtime_method.cpp:
        * bridge/runtime_method.h:
        * bridge/runtime_object.cpp:
        * bridge/runtime_object.h:
        * bridge/runtime_root.cpp:
        * bridge/runtime_root.h:

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

28 files changed:
WebCore/ChangeLog
WebCore/bridge/NP_jsobject.cpp
WebCore/bridge/c/c_class.cpp
WebCore/bridge/c/c_instance.cpp
WebCore/bridge/c/c_utility.cpp
WebCore/bridge/jni/jni_class.cpp
WebCore/bridge/jni/jni_jsobject.cpp
WebCore/bridge/jni/jni_objc.mm
WebCore/bridge/jni/jni_runtime.cpp
WebCore/bridge/jni/jni_utility.cpp
WebCore/bridge/jni/jni_utility.h
WebCore/bridge/npruntime.cpp
WebCore/bridge/objc/WebScriptObject.h
WebCore/bridge/objc/objc_class.h
WebCore/bridge/objc/objc_instance.h
WebCore/bridge/objc/objc_runtime.h
WebCore/bridge/objc/objc_utility.h
WebCore/bridge/objc/objc_utility.mm
WebCore/bridge/runtime.cpp
WebCore/bridge/runtime.h
WebCore/bridge/runtime_array.cpp
WebCore/bridge/runtime_array.h
WebCore/bridge/runtime_method.cpp
WebCore/bridge/runtime_method.h
WebCore/bridge/runtime_object.cpp
WebCore/bridge/runtime_object.h
WebCore/bridge/runtime_root.cpp
WebCore/bridge/runtime_root.h

index 0085c321637dd5efa280635f49e0dc4391466416..8f617b6222378ef14b022fab47130e3d93de3bbd 100644 (file)
@@ -1,3 +1,40 @@
+2008-03-04  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam.
+
+        Update include paths. This code is not used yet.
+
+        * bridge/NP_jsobject.cpp:
+        * bridge/c/c_class.cpp:
+        * bridge/c/c_instance.cpp:
+        * bridge/c/c_utility.cpp:
+        (KJS::Bindings::convertUTF8ToUTF16WithLatin1Fallback):
+        #if 0 this out for now. 
+        
+        * bridge/jni/jni_class.cpp:
+        * bridge/jni/jni_jsobject.cpp:
+        * bridge/jni/jni_objc.mm:
+        * bridge/jni/jni_runtime.cpp:
+        * bridge/jni/jni_utility.cpp:
+        * bridge/jni/jni_utility.h:
+        * bridge/npruntime.cpp:
+        * bridge/objc/WebScriptObject.h:
+        * bridge/objc/objc_class.h:
+        * bridge/objc/objc_instance.h:
+        * bridge/objc/objc_runtime.h:
+        * bridge/objc/objc_utility.h:
+        * bridge/objc/objc_utility.mm:
+        * bridge/runtime.cpp:
+        * bridge/runtime.h:
+        * bridge/runtime_array.cpp:
+        * bridge/runtime_array.h:
+        * bridge/runtime_method.cpp:
+        * bridge/runtime_method.h:
+        * bridge/runtime_object.cpp:
+        * bridge/runtime_object.h:
+        * bridge/runtime_root.cpp:
+        * bridge/runtime_root.h:
+
 2008-03-04  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Darin Adler.
index 059b5df4c36756c4a4995125a3941d46b620c61b..9f5f14382d105172fb07ae35a14235079476e98f 100644 (file)
 
 #include "NP_jsobject.h"
 
-#include "JSGlobalObject.h"
-#include "PropertyNameArray.h"
+#include <kjs/JSGlobalObject.h>
+#include <kjs/PropertyNameArray.h>
 #include "c_utility.h"
-#include "interpreter.h"
+#include <kjs/interpreter.h>
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
-#include "object.h"
+
 #include "runtime_root.h"
 
 using namespace KJS;
index f0bb8da2a2cc297b74ac657632675a14adb19246..257b42e1d910e77d62722b6b2337b2a061866616 100644 (file)
@@ -31,8 +31,8 @@
 
 #include "c_instance.h"
 #include "c_runtime.h"
-#include "identifier.h"
 #include "npruntime_impl.h"
+#include <kjs/identifier.h>
 
 namespace KJS { namespace Bindings {
 
index 3d040548c878331620b0c2a21904c72bfdd0830f..7c7a33fbf9d6d1f3c7490851c6c1531248af04a2 100644 (file)
 #include "c_class.h"
 #include "c_runtime.h"
 #include "c_utility.h"
-#include "list.h"
 #include "npruntime_impl.h"
-#include "PropertyNameArray.h"
 #include "runtime_root.h"
+#include <kjs/ExecState.h>
+#include <kjs/PropertyNameArray.h>
 #include <wtf/Assertions.h>
 #include <wtf/StringExtras.h>
 #include <wtf/Vector.h>
index 7e2a19f79ef0d3586d7b1ed38214d6c522f6d1c6..9c3099a1c31ecafd814ec820da67b8ca317dd2f3 100644 (file)
 
 #include "NP_jsobject.h"
 #include "c_instance.h"
-#include "JSGlobalObject.h"
+#include <kjs/JSGlobalObject.h>
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
-#include "Platform.h"
 #include <wtf/Assertions.h>
-#include <wtf/unicode/UTF8.h>
 
-using namespace WTF::Unicode;
+// FIXME: Rewrite convertUTF8ToUTF16WithLatin1Fallback to not use the WTF UTF-8 support.
+#if 0
+#include <wtf/unicode/UTF8.h>
+#endif
 
 namespace KJS { namespace Bindings {
 
 // Requires free() of returned UTF16Chars.
 static void convertUTF8ToUTF16WithLatin1Fallback(const NPUTF8* UTF8Chars, int UTF8Length, NPUTF16** UTF16Chars, unsigned int* UTF16Length)
 {
+#if 0
     ASSERT(UTF8Chars || UTF8Length == 0);
     ASSERT(UTF16Chars);
     
@@ -80,6 +82,7 @@ static void convertUTF8ToUTF16WithLatin1Fallback(const NPUTF8* UTF8Chars, int UT
         for (unsigned i = 0; i < *UTF16Length; i++)
             (*UTF16Chars)[i] = UTF8Chars[i] & 0xFF;
     }
+#endif
 }
 
 // Variant value must be released with NPReleaseVariantValue()
index 72b1a73ff39727e05ff2426d4264a5b9f11b7a4f..9a7f27457c3b5c5300ec1f9f54b669baf2626607 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 #include "config.h"
-#include <jni_class.h>
+#include "jni_class.h"
 
-#include "identifier.h"
-#include <jni_utility.h>
-#include <jni_runtime.h>
+#include <kjs/identifier.h>
+#include "jni_utility.h"
+#include "jni_runtime.h"
 
 using namespace KJS::Bindings;
 
index 347f24f23112a1a54d1dd238e071ef3e3ac007d7..602aca7ef8d2e25ab2f1fe29b2f5acb40042e024 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 #include "config.h"
-
-#include "identifier.h"
-#include "internal.h"
-#include "interpreter.h"
 #include "jni_jsobject.h"
+
 #include "jni_runtime.h"
 #include "jni_utility.h"
-#include "JSGlobalObject.h"
-#include "list.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include <CoreFoundation/CoreFoundation.h>
+#include <kjs/ExecState.h>
+#include <kjs/JSGlobalObject.h>
+#include <kjs/interpreter.h>
+
 #include <wtf/Assertions.h>
 
 using namespace KJS::Bindings;
index 43d2da034de503ebb29cf897090e21bb4e35cd0f..a23494b50cca34098c6e4ba70faafc577a82f872 100644 (file)
@@ -24,8 +24,8 @@
  */
 #include "config.h"
 #import <Foundation/Foundation.h>
-#import <JavaScriptCore/jni_utility.h>
-#import <JavaScriptCore/objc_utility.h>
+#import "jni_utility.h"
+#import "objc_utility.h"
 
 using namespace KJS::Bindings;
 
index 7d7cb31fb9f58d7e66dc190ab1b4fb5449676377..d7c8659cadaf92fb11199b900078b60b8ce4e754 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 #include "config.h"
-#include <internal.h>
-#include <ustring.h>
-#include <value.h>
 
 #include <jni_utility.h>
 #include <jni_runtime.h>
 
-#include <runtime_array.h>
-#include <runtime_object.h>
-#include <runtime_root.h>
+#include "runtime_array.h"
+#include "runtime_object.h"
+#include "runtime_root.h"
 
 #ifdef NDEBUG
 #define JS_LOG(formatAndArgs...) ((void)0)
index 8a8c6560ee480a4e224ee4ac385db7a73c7b093a..1898a931628ec06ea826f94fa788626786fdc4a7 100644 (file)
 #include "config.h"
 #include "jni_utility.h"
 
-#include "list.h"
 #include "jni_runtime.h"
 #include "runtime_array.h"
 #include "runtime_object.h"
+#include <kjs/array_instance.h>
 #include <dlfcn.h>
 
 namespace KJS {
index 69aa7393434e6c221cd2d868f4376b83e76404d9..3eb9282eb15407a3f48d65090724f7ae393d08db 100644 (file)
@@ -25,8 +25,6 @@
 #ifndef _JNI_UTILITY_H_
 #define _JNI_UTILITY_H_
 
-#include <list.h>
-
 #include <JavaVM/jni.h>
 
 // The order of these items can not be modified as they are tightly
@@ -51,6 +49,10 @@ typedef enum {
 
 namespace KJS {
 
+class ExecState;
+class JSObject;    
+class JSValue;
+
 namespace Bindings {
 
 class JavaParameter;
index ea7ea63ca9ab4f75b409782c2f66f1dc6db96768..d0e19139fe473e3e1c11e2ab81804a77feb08aae 100644 (file)
@@ -31,9 +31,9 @@
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
 
-#include "JSLock.h"
 #include "c_utility.h"
-#include "identifier.h"
+#include <kjs/identifier.h>
+#include <kjs/JSLock.h>
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
 
index 14d77d78e87db0518869f74949c63b426649ca91..a8ed04349ef6d9db2bde54df9ac35e56176ca949 100644 (file)
@@ -25,7 +25,6 @@
 
 #import <Foundation/Foundation.h>
 
-#include "internal.h"
 #include "runtime_root.h"
 
 @class WebUndefined;
index 3faee188e176c3612dcc60c8135799f82681c149..e0709e5182e45fa9905d8bd311a108734c464de2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef KJS_BINDINGS_OBJC_CLASS_H
 #define KJS_BINDINGS_OBJC_CLASS_H
 
-#include <JavaScriptCore/objc_runtime.h>
+#include "objc_runtime.h"
 
 namespace KJS {
 namespace Bindings {
index 223379115cd6b54841e9a5a3c872857c6f620d12..441b5401ad52a2eebc07738f7ce7657ec65b637d 100644 (file)
@@ -26,8 +26,8 @@
 #ifndef BINDINGS_OBJC_INSTANCE_H_
 #define BINDINGS_OBJC_INSTANCE_H_
 
-#include <JavaScriptCore/objc_class.h>
-#include <JavaScriptCore/objc_utility.h>
+#include "objc_class.h"
+#include "objc_utility.h"
 
 namespace KJS {
 
index 74bc49ee9bf16bc1442c8ba73a98598158ea09b7..3c2bad1ca2caa416706722b5d99103463e43c288 100644 (file)
@@ -27,9 +27,9 @@
 #define KJS_BINDINGS_OBJC_RUNTIME_H
 
 #include <CoreFoundation/CoreFoundation.h>
-#include <JavaScriptCore/objc_header.h>
-#include <JavaScriptCore/object.h>
-#include <JavaScriptCore/runtime.h>
+#include <kjs/object.h>
+#include "objc_header.h"
+#include "runtime.h"
 
 #include <wtf/RetainPtr.h>
 
index e674fccf28b20dd39aa8dbf6d25e3e6160ca3ffb..321c7fee852c25a715114d0c23c5309f5c6b9ccb 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "object.h"
+#include <kjs/object.h>
 #include "objc_header.h"
 
 #ifdef __OBJC__
index 62a0ad01dc76651818b678139553644f55d937f0..18c17ff9e9eaaf6c7911f35bc928ed2cae369cdb 100644 (file)
 #include "objc_utility.h"
 
 #include "objc_instance.h"
-#include "JSGlobalObject.h"
 #include "runtime_array.h"
 #include "runtime_object.h"
 #include "WebScriptObject.h"
+#include <kjs/JSGlobalObject.h>
 #include <wtf/Assertions.h>
 
 #if !defined(_C_LNG_LNG)
index cc68fa61e8fe20756578387e20bbf40389457374..f78dba0dc12a93b3531397662940ec21171305eb 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "runtime.h"
 
-#include "JSLock.h"
 #include "NP_jsobject.h"
 #include "c_instance.h"
 #include "runtime_object.h"
index dbb324c64e44ceaca5f848fbd1cf0a95f9238021..dd8bdf2b0b022e0560bb38ef7fb485de40ecf300 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JAVASCRIPTCORE_BINDINGS_RUNTIME_H
 #define JAVASCRIPTCORE_BINDINGS_RUNTIME_H
 
-#include "value.h"
+#include <kjs/value.h>
 
 #include <wtf/Noncopyable.h>
 #include <wtf/HashMap.h>
index 005bae24c33194ef09c549a3cdd58ea536abb90f..3c0585279f1da2000bfe301f535832c5c126aa44 100644 (file)
@@ -26,8 +26,7 @@
 #include "config.h"
 #include "runtime_array.h"
 
-#include "JSGlobalObject.h"
-#include "array_object.h"
+#include <kjs/array_object.h>
 
 using namespace KJS;
 
index 74b540f52b19a252a22dc169be9e6715a118905a..df7c3e2eb49256c4ca8533ef932a0a8c4f8ec814 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <wtf/OwnPtr.h>
 
-#include "array_instance.h"
+#include <kjs/object.h>
 #include "runtime.h"
 
 namespace KJS {
index 4430f2529f297780c06ff1d8a1c9d7809ca9b99a..c354bb7a360c341191f3cf6e6ef269488519c43d 100644 (file)
 #include "config.h"
 #include "runtime_method.h"
 
-#include "ExecState.h"
-#include "JSGlobalObject.h"
+#include <kjs/JSGlobalObject.h>
 #include "runtime_object.h"
-#include "function_object.h"
 
 using namespace KJS::Bindings;
 using namespace KJS;
index 7fbe32a5a3b99cfee47dd0b3b15ea8f4f7caea1e..a11f555f797eb57dd08efb22852bc4536df45f03 100644 (file)
@@ -26,9 +26,8 @@
 #ifndef RUNTIME_FUNCTION_H_
 #define RUNTIME_FUNCTION_H_
 
-#include "function.h"
+#include <kjs/function.h>
 #include "runtime.h"
-#include "object.h"
 
 namespace KJS {
 
index 30ab488539783ad79286b1b148622859d6830539..0fdfaa105130b84a7062352398feedcd3b9b882b 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "runtime_object.h"
 
-#include "error_object.h"
-#include "operations.h"
 #include "runtime_method.h"
 #include "runtime_root.h"
 
index e2387e3ae065dee24b128a8b375ac9c1b1b10aaa..6f9a5262b439538f6f56d83a1d78c1d2f59634c3 100644 (file)
@@ -26,8 +26,9 @@
 #ifndef KJS_RUNTIME_OBJECT_H
 #define KJS_RUNTIME_OBJECT_H
 
+#include <kjs/object.h>
+
 #include "runtime.h"
-#include "object.h"
 
 #include <wtf/Noncopyable.h>
 
index e7ae28f0202acd96745e40bc97f90ea313445587..97e515da7e0e1e5d0d1af7a4f4c305ffb6690a47 100644 (file)
 #include "config.h"
 #include "runtime_root.h"
 
-#include "JSGlobalObject.h"
-#include "object.h"
 #include "runtime.h"
 #include "runtime_object.h"
+#include <kjs/JSGlobalObject.h>
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
 
index 4db02d41b41d8e91a045be2b685e9eb250573bd7..5df8b9d88d4e2e755234f5a0dbb0d186e6fe9155 100644 (file)
@@ -29,7 +29,7 @@
 #if PLATFORM(MAC)
 #include "jni_jsobject.h"
 #endif
-#include "protect.h"
+#include <kjs/protect.h>
 
 #include <wtf/HashSet.h>
 #include <wtf/Noncopyable.h>