Reviewed by Darin and Sam.
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Mar 2008 21:53:58 +0000 (21:53 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Mar 2008 21:53:58 +0000 (21:53 +0000)
        Include fixes, in preparation of using the headers in WebCore/bridge.

        * bindings/js/kjs_binding.h:
        * bindings/js/kjs_dom.cpp:
        * bindings/objc/DOMInternal.mm:
        * bindings/objc/DOMUtility.mm:
        * bindings/objc/WebScriptObject.mm:
        * bindings/objc/WebScriptObjectPrivate.h:
        * bridge/objc/objc_class.h:
        * bridge/objc/objc_instance.h:
        * bridge/objc/objc_runtime.h:
        * bridge/objc/objc_utility.h:
        * bridge/runtime.h:
        * bridge/runtime_object.h:
        * bridge/runtime_root.h:
        * html/HTMLAppletElement.cpp:
        * html/HTMLAppletElement.h:
        * html/HTMLEmbedElement.cpp:
        * html/HTMLEmbedElement.h:
        * html/HTMLObjectElement.cpp:
        * html/HTMLPlugInElement.cpp:
        * html/HTMLPlugInElement.h:
        * page/mac/FrameMac.mm:
        * page/mac/WebCoreFrameBridge.h:
        * page/mac/WebCoreFrameBridge.mm:
        * page/mac/WebCoreScriptDebugger.mm:

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

18 files changed:
WebCore/ChangeLog
WebCore/bindings/js/kjs_binding.h
WebCore/bindings/js/kjs_dom.cpp
WebCore/bindings/objc/DOMInternal.mm
WebCore/bindings/objc/DOMUtility.mm
WebCore/bindings/objc/WebScriptObject.mm
WebCore/bindings/objc/WebScriptObjectPrivate.h
WebCore/html/HTMLAppletElement.cpp
WebCore/html/HTMLAppletElement.h
WebCore/html/HTMLEmbedElement.cpp
WebCore/html/HTMLEmbedElement.h
WebCore/html/HTMLObjectElement.cpp
WebCore/html/HTMLPlugInElement.cpp
WebCore/html/HTMLPlugInElement.h
WebCore/page/mac/FrameMac.mm
WebCore/page/mac/WebCoreFrameBridge.h
WebCore/page/mac/WebCoreFrameBridge.mm
WebCore/page/mac/WebCoreScriptDebugger.mm

index c809aac2aa58b0a5aead687f61b06602fd9b417b..3ca0c719bd0b1051503a8cf36518d3c443b66c55 100644 (file)
@@ -1,3 +1,34 @@
+2008-03-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin and Sam.
+
+        Include fixes, in preparation of using the headers in WebCore/bridge.
+        
+        * bindings/js/kjs_binding.h:
+        * bindings/js/kjs_dom.cpp:
+        * bindings/objc/DOMInternal.mm:
+        * bindings/objc/DOMUtility.mm:
+        * bindings/objc/WebScriptObject.mm:
+        * bindings/objc/WebScriptObjectPrivate.h:
+        * bridge/objc/objc_class.h:
+        * bridge/objc/objc_instance.h:
+        * bridge/objc/objc_runtime.h:
+        * bridge/objc/objc_utility.h:
+        * bridge/runtime.h:
+        * bridge/runtime_object.h:
+        * bridge/runtime_root.h:
+        * html/HTMLAppletElement.cpp:
+        * html/HTMLAppletElement.h:
+        * html/HTMLEmbedElement.cpp:
+        * html/HTMLEmbedElement.h:
+        * html/HTMLObjectElement.cpp:
+        * html/HTMLPlugInElement.cpp:
+        * html/HTMLPlugInElement.h:
+        * page/mac/FrameMac.mm:
+        * page/mac/WebCoreFrameBridge.h:
+        * page/mac/WebCoreFrameBridge.mm:
+        * page/mac/WebCoreScriptDebugger.mm:
+
 2008-03-03  David Hyatt  <hyatt@apple.com>
 
         Full page zoom plumbing.  Add a notion of whether or not a zoom is text only or a full zoom to the
index fb9565270020e8e960ef5869e2fe8805b5607301..9cdeddd4165436d82c65ecb287d25822982035ab 100644 (file)
 #include <kjs/lookup.h>
 #include <wtf/Noncopyable.h>
 
-#if PLATFORM(MAC)
-#include <JavaScriptCore/runtime.h>
-#endif
-
 namespace WebCore {
 
     class AtomicString;
index e718d41647f62a14470b241c0937067bb4ee67fb..ee1d42bfe73745c367983e06eedc58301fed8688 100644 (file)
@@ -37,7 +37,7 @@
 #endif
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime_object.h>
+#include <bindings/runtime.h>
 #endif
 
 namespace WebCore {
index afef8c890983cf6d786605c87f88e764f0b2c7a4..892e049038a5de0f03f7c196c45bc01c69b2824d 100644 (file)
@@ -38,6 +38,7 @@
 #import "WebScriptObjectPrivate.h"
 #import "XPathEvaluator.h"
 #import "kjs_proxy.h"
+#import <bindings/runtime_root.h>
 
 //------------------------------------------------------------------------------------------
 // Wrapping WebCore implementation objects
index 16204a394a8f21ac3edc9f72b446bda1e6e03f5b..37181b0e4e1a7af6b2c5d095aa0df87b7c0c02d8 100644 (file)
@@ -55,6 +55,7 @@
 #import "kjs_html.h"
 #import "kjs_window.h"
 #import <objc/objc-runtime.h>
+#import <bindings/runtime_root.h>
 
 // This file makes use of both the ObjC DOM API and the C++ DOM API, so we need to be careful about what
 // headers are included and what namespaces we use to avoid naming conflicts.
index 7c06b76296d4ecf82148d4f335ee332259ec3bd9..8454f3dc5bf793c0c3c8579390f64cf50b4b8319 100644 (file)
 #import "PlatformString.h"
 #import "WebCoreObjCExtras.h"
 #import <JavaScriptCore/ExecState.h>
-#import <JavaScriptCore/objc_instance.h>
-#import <JavaScriptCore/runtime_object.h>
 #import <JavaScriptCore/APICast.h>
 #import <JavaScriptCore/JSGlobalObject.h>
 #import <JavaScriptCore/interpreter.h>
+#import <JavaScriptCore/objc_instance.h>
+#import <bindings/runtime_root.h>
+#import <bindings/runtime.h>
+#import <bindings/runtime_object.h>
 
 using namespace KJS;
 using namespace KJS::Bindings;
index 421209d033a8f4b8d5f95f2b13ac9bcc2d829fa9..2bcc3b8f7402fcba86a3121fee051c0793356c61 100644 (file)
 
 #import "WebScriptObject.h"
 
-#include <JavaScriptCore/internal.h>
-#include <JavaScriptCore/object.h>
-#include <JavaScriptCore/runtime_root.h>
-#include <JavaScriptCore/APICast.h>
+#import <wtf/PassRefPtr.h>
 
+namespace KJS {
+    
+    class JSObject;
+    class JSValue;
+    
+    namespace Bindings {
+        class RootObject;
+    }
+}
 namespace WebCore {
     NSObject* getJSWrapper(KJS::JSObject*);
     void addJSWrapper(NSObject* wrapper, KJS::JSObject*);
index 4e199ad117fa4c9730bda2fbbe66aa66780ec390..63c59ddb82cda68cbf8648cbbc2c9bbb91f38a06 100644 (file)
 #include "RenderInline.h"
 #include "Settings.h"
 
+#if USE(JAVASCRIPTCORE_BINDINGS)
+#include <bindings/runtime.h>
+#endif
+
 namespace WebCore {
 
 using namespace HTMLNames;
index 5025277866b49028015680b2dc1168ae61f41c66..ae8f89291118915a208a77105c32888b9fd3920f 100644 (file)
 #include "HTMLPlugInElement.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
-#else
-namespace KJS { namespace Bindings { class Instance; } }
+namespace KJS { 
+    namespace Bindings { 
+        class Instance;
+    } 
+}
 #endif
 
 namespace WebCore {
index ae6586366b66cf18840e8b3b52b51ff100c254d9..d4fba262d8ae34781c69f789a01599b7e1b1e6a6 100644 (file)
 #include "HTMLNames.h"
 #include "RenderPartObject.h"
 
+#if USE(JAVASCRIPTCORE_BINDINGS)
+#include <bindings/runtime.h>
+#endif
+
 namespace WebCore {
 
 using namespace HTMLNames;
index 1fc0ba51d727e8e65cf9ad1e16f7ee5711250794..5c6ce67bd960ec734922af9a71def7d4750382fe 100644 (file)
 #include "HTMLPlugInElement.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+namespace KJS {
+    namespace Bindings {
+        class Instance;
+    }
+}
 #endif
 
 namespace WebCore {
index 436b64163e217cd72348271df06bef389ef7a09c..3fba40f91e8a6d5b6b634ce0dbd5c05b98e9dc75 100644 (file)
 #include "RenderWidget.h"
 #include "Text.h"
 
+#if USE(JAVASCRIPTCORE_BINDINGS)
+#include <bindings/runtime.h>
+#endif
+
 namespace WebCore {
 
 using namespace EventNames;
index 93e1bf6c383242f1ca645d03f920962834e87af8..67d463d8ed334748dde3dd59ead04349ae8c377c 100644 (file)
@@ -40,6 +40,7 @@
 #if USE(NPOBJECT)
 #include <bindings/NP_jsobject.h>
 #include <bindings/npruntime_impl.h>
+#include <bindings/runtime.h>
 #include <bindings/runtime_root.h>
 #endif
 
index 2b9ed5355bd82abb5b67931f940be91ec39ebc63..c9cdfd6c0f5fde35f573729debd43a3964478c1d 100644 (file)
 #include "HTMLFrameOwnerElement.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
-#include <bindings/runtime.h>
+namespace KJS {
+    namespace Bindings {
+        class Instance;
+    }
+}
 #endif
 
 #if USE(NPOBJECT)
-#include <bindings/npruntime_internal.h>
+struct NPObject;
 #endif
 
 namespace WebCore {
index 6f6f096f9f33fb567ac5f079a3090b962ed8766d..1315f1763f840675dac84416a2bf3c025e15465f 100644 (file)
 #import "kjs_window.h"
 #import "visible_units.h"
 #import <Carbon/Carbon.h>
-#import <JavaScriptCore/NP_jsobject.h>
-#import <JavaScriptCore/npruntime_impl.h>
+#import <JavaScriptCore/APICast.h>
+#import <bindings/NP_jsobject.h>
+#import <bindings/npruntime_impl.h>
+#import <bindings/runtime_root.h>
+#import <bindings/runtime.h>
 
 #undef _webcore_TIMING
 
index 76315f7fb4b245766674dda8d87e4c08abce7309..09ac6cd9ae8e48a1c6445a959312f94f0e3b4d0b 100644 (file)
 #import <WebCore/TextAffinity.h>
 #import <WebCore/TextGranularity.h>
 
-#if USE(NPOBJECT)
-#import <JavaScriptCore/npruntime.h>
-#endif
-
 namespace WebCore {
     class Frame;
     class HTMLFrameOwnerElement;
index 5c74db76aac54197c5b23a940418684be3207f80..b883a3992375d442010230adcc51be72f9353bf3 100644 (file)
@@ -91,7 +91,8 @@
 #import <OpenScripting/ASRegistry.h>
 #import <JavaScriptCore/array_instance.h>
 #import <JavaScriptCore/date_object.h>
-#import <JavaScriptCore/runtime_root.h>
+#import <bindings/runtime_root.h>
+#import <bindings/runtime.h>
 #import <wtf/RetainPtr.h>
 
 @class NSView;
index ae68a63e12d35a194da10e47378cb889146fc050..cfb3de61359a61e5bc450299e1e361706911adff 100644 (file)
@@ -38,6 +38,7 @@
 #import <JavaScriptCore/debugger.h>
 #import <JavaScriptCore/function.h>
 #import <JavaScriptCore/interpreter.h>
+#import <bindings/runtime_root.h>
 
 using namespace KJS;
 using namespace WebCore;