2011-03-01 Steve Block <steveblock@google.com>
authorsteveblock@google.com <steveblock@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Mar 2011 11:51:46 +0000 (11:51 +0000)
committersteveblock@google.com <steveblock@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Mar 2011 11:51:46 +0000 (11:51 +0000)
        Reviewed by Jeremy Orlow.

        Bridge.h should not include BridgeJSC.h
        https://bugs.webkit.org/show_bug.cgi?id=55212

        Instead, BridgeJSC.h should include Bridge.h and code should include
        BridgeJSC.h as appropriate.

        This prevents ports that use V8 from having to include JSC-specific
        files, even if the contents of those files are guarded.

        No new tests, cleanup only.

        * bindings/js/JSPluginElementFunctions.cpp:
        * bindings/js/ScriptControllerBrew.cpp:
        * bindings/js/ScriptControllerGtk.cpp:
        * bindings/js/ScriptControllerHaiku.cpp:
        * bindings/js/ScriptControllerQt.cpp:
        * bindings/js/ScriptControllerMac.mm:
        * bindings/js/ScriptControllerWin.cpp:
        * bindings/js/ScriptControllerWx.cpp:
        * bindings/js/ScriptInstance.h:
        * bindings/objc/WebScriptObject.mm:
        * bridge/Bridge.h:
        * bridge/c/c_class.h:
        * bridge/c/c_instance.h:
        * bridge/c/c_runtime.h:
        * bridge/jni/jsc/JNIBridgeJSC.h:
        * bridge/jni/jsc/JavaInstanceJSC.h:
        * bridge/jsc/BridgeJSC.h:
        * bridge/objc/objc_runtime.h:
        * bridge/qt/qt_class.h:
        * bridge/qt/qt_instance.h:
        * bridge/qt/qt_pixmapruntime.h:
        * bridge/qt/qt_runtime.h:
        * bridge/runtime_array.h:
        * bridge/runtime_method.h:
        * bridge/runtime_object.h:
        * bridge/runtime_root.cpp:
        * bridge/testbindings.cpp:
        * bridge/testbindings.mm:
        * bridge/testqtbindings.cpp:
        * page/win/FrameWin.cpp:
        * platform/graphics/wince/MediaPlayerProxy.cpp:
        * plugins/PluginView.cpp:
        * plugins/PluginViewNone.cpp:
        * plugins/gtk/PluginViewGtk.cpp:
        * plugins/mac/PluginViewMac.mm:
        * plugins/qt/PluginViewQt.cpp:
        * plugins/symbian/PluginViewSymbian.cpp:
        * plugins/win/PluginViewWin.cpp:
2011-02-25 Steve Block <steveblock@google.com>

        Reviewed by Jeremy Orlow.

        Bridge.h should not include BridgeJSC.h
        https://bugs.webkit.org/show_bug.cgi?id=55212

        Include BridgeJSC.h directly instead.

        * Plugins/Hosted/ProxyInstance.h:
        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
2011-02-25 Steve Block <steveblock@google.com>

        Reviewed by Jeremy Orlow.

        Bridge.h should not include BridgeJSC.h
        https://bugs.webkit.org/show_bug.cgi?id=55212

        Include BridgeJSC.h directly instead.

        * Api/qwebframe.cpp:

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

44 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bindings/js/JSPluginElementFunctions.cpp
Source/WebCore/bindings/js/ScriptControllerBrew.cpp
Source/WebCore/bindings/js/ScriptControllerGtk.cpp
Source/WebCore/bindings/js/ScriptControllerHaiku.cpp
Source/WebCore/bindings/js/ScriptControllerMac.mm
Source/WebCore/bindings/js/ScriptControllerQt.cpp
Source/WebCore/bindings/js/ScriptControllerWin.cpp
Source/WebCore/bindings/js/ScriptControllerWx.cpp
Source/WebCore/bindings/js/ScriptInstance.h
Source/WebCore/bindings/objc/WebScriptObject.mm
Source/WebCore/bridge/Bridge.h
Source/WebCore/bridge/c/c_class.h
Source/WebCore/bridge/c/c_instance.h
Source/WebCore/bridge/c/c_runtime.h
Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h
Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
Source/WebCore/bridge/jsc/BridgeJSC.h
Source/WebCore/bridge/objc/objc_runtime.h
Source/WebCore/bridge/qt/qt_class.h
Source/WebCore/bridge/qt/qt_instance.h
Source/WebCore/bridge/qt/qt_pixmapruntime.h
Source/WebCore/bridge/qt/qt_runtime.h
Source/WebCore/bridge/runtime_array.h
Source/WebCore/bridge/runtime_method.h
Source/WebCore/bridge/runtime_object.h
Source/WebCore/bridge/runtime_root.cpp
Source/WebCore/bridge/testbindings.cpp
Source/WebCore/bridge/testbindings.mm
Source/WebCore/bridge/testqtbindings.cpp
Source/WebCore/page/win/FrameWin.cpp
Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp
Source/WebCore/plugins/PluginView.cpp
Source/WebCore/plugins/PluginViewNone.cpp
Source/WebCore/plugins/gtk/PluginViewGtk.cpp
Source/WebCore/plugins/mac/PluginViewMac.mm
Source/WebCore/plugins/qt/PluginViewQt.cpp
Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
Source/WebCore/plugins/win/PluginViewWin.cpp
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
Source/WebKit/qt/Api/qwebframe.cpp
Source/WebKit/qt/ChangeLog

index bb5b503..8401bc3 100644 (file)
@@ -1,3 +1,57 @@
+2011-03-01  Steve Block  <steveblock@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Bridge.h should not include BridgeJSC.h
+        https://bugs.webkit.org/show_bug.cgi?id=55212
+
+        Instead, BridgeJSC.h should include Bridge.h and code should include
+        BridgeJSC.h as appropriate.
+
+        This prevents ports that use V8 from having to include JSC-specific
+        files, even if the contents of those files are guarded.
+
+        No new tests, cleanup only.
+
+        * bindings/js/JSPluginElementFunctions.cpp:
+        * bindings/js/ScriptControllerBrew.cpp:
+        * bindings/js/ScriptControllerGtk.cpp:
+        * bindings/js/ScriptControllerHaiku.cpp:
+        * bindings/js/ScriptControllerQt.cpp:
+        * bindings/js/ScriptControllerMac.mm:
+        * bindings/js/ScriptControllerWin.cpp:
+        * bindings/js/ScriptControllerWx.cpp:
+        * bindings/js/ScriptInstance.h:
+        * bindings/objc/WebScriptObject.mm:
+        * bridge/Bridge.h:
+        * bridge/c/c_class.h:
+        * bridge/c/c_instance.h:
+        * bridge/c/c_runtime.h:
+        * bridge/jni/jsc/JNIBridgeJSC.h:
+        * bridge/jni/jsc/JavaInstanceJSC.h:
+        * bridge/jsc/BridgeJSC.h:
+        * bridge/objc/objc_runtime.h:
+        * bridge/qt/qt_class.h:
+        * bridge/qt/qt_instance.h:
+        * bridge/qt/qt_pixmapruntime.h:
+        * bridge/qt/qt_runtime.h:
+        * bridge/runtime_array.h:
+        * bridge/runtime_method.h:
+        * bridge/runtime_object.h:
+        * bridge/runtime_root.cpp:
+        * bridge/testbindings.cpp:
+        * bridge/testbindings.mm:
+        * bridge/testqtbindings.cpp:
+        * page/win/FrameWin.cpp:
+        * platform/graphics/wince/MediaPlayerProxy.cpp:
+        * plugins/PluginView.cpp:
+        * plugins/PluginViewNone.cpp:
+        * plugins/gtk/PluginViewGtk.cpp:
+        * plugins/mac/PluginViewMac.mm:
+        * plugins/qt/PluginViewQt.cpp:
+        * plugins/symbian/PluginViewSymbian.cpp:
+        * plugins/win/PluginViewWin.cpp:
+
 2011-03-01  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Reviewed by Antti Koivisto.
index 893b967..26bb05d 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "JSPluginElementFunctions.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "HTMLNames.h"
 #include "HTMLPlugInElement.h"
 #include "JSHTMLElement.h"
index d8d345a..51dee24 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "PluginView.h"
 #include "runtime_root.h"
 
index 6ffae69..886f110 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "PluginView.h"
 #include "runtime_root.h"
 
index a1f1590..22d55a2 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "PluginView.h"
 #include "runtime_root.h"
 
@@ -43,4 +43,3 @@ PassRefPtr<JSC::Bindings::Instance> ScriptController::createScriptInstanceForWid
 }
 
 } // namespace WebCore
-
index 7c29bfc..f7ad3ff 100644 (file)
@@ -29,7 +29,7 @@
 #import "config.h"
 #import "ScriptController.h"
 
-#import "Bridge.h"
+#import "BridgeJSC.h"
 #import "DOMAbstractViewFrame.h"
 #import "DOMWindow.h"
 #import "Frame.h"
index ee7ceff..a8cdf9d 100644 (file)
@@ -36,7 +36,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "DOMWindow.h"
 #include "PluginView.h"
 #include "qt_instance.h"
index e0a959e..9780c93 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "PluginView.h"
 
 using namespace JSC::Bindings;
index 1d7b4ca..632f63c 100644 (file)
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "ScriptController.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "PluginView.h"
 #include "runtime_root.h"
 
index 0b3b59f..d4245b1 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef ScriptInstance_h
 #define ScriptInstance_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 00f99b3..d2ef25d 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebScriptObjectPrivate.h"
 
-#import "Bridge.h"
+#import "BridgeJSC.h"
 #import "Console.h"
 #import "DOMInternal.h"
 #import "DOMWindow.h"
index 00d6f36..ff3c7f8 100644 (file)
@@ -27,7 +27,8 @@
 #ifndef Bridge_h
 #define Bridge_h
 
-#include "BridgeJSC.h"
+#include <wtf/FastAllocBase.h>
+#include <wtf/Noncopyable.h>
 
 namespace JSC  {
 
index 52db2b9..0ee88cf 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "npruntime_internal.h"
 #include <wtf/HashMap.h>
 
index cc1a806..a525a7a 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_root.h"
 #include <wtf/PassRefPtr.h>
 
index 5355934..47b7cee 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "npruntime_internal.h"
 
 namespace JSC {
index 18725fd..c376bb9 100644 (file)
@@ -29,7 +29,7 @@
 
 #if ENABLE(JAVA_BRIDGE)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JNIBridge.h"
 #include "JNIUtility.h"
 
index a1f9272..7690cee 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(JAVA_BRIDGE)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JNIUtility.h"
 #include "runtime_root.h"
 
index 4de606f..c44faf1 100644 (file)
@@ -29,6 +29,7 @@
 
 #if USE(JSC)
 
+#include "Bridge.h"
 #include <runtime/JSString.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
index 56e2874..1cee85b 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef KJS_BINDINGS_OBJC_RUNTIME_H
 #define KJS_BINDINGS_OBJC_RUNTIME_H
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "objc_header.h"
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSObjectWithGlobalObject.h>
index 9d55cc5..4c1a753 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef qt_class_h
 #define qt_class_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "qglobal.h"
 
 QT_BEGIN_NAMESPACE
index 7da941a..003c801 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef qt_instance_h
 #define qt_instance_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_root.h"
 #include <QtScript/qscriptengine.h>
 #include <qhash.h>
index e2ae5e9..b474efd 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef qt_pixmapruntime_h
 #define qt_pixmapruntime_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <QVariant>
 
 namespace JSC {
index e7d3a74..b86ccbe 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef BINDINGS_QT_RUNTIME_H_
 #define BINDINGS_QT_RUNTIME_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Completion.h"
 #include "Global.h"
 #include "runtime_method.h"
index c8dc51d..f4c74e2 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef RUNTIME_ARRAY_H_
 #define RUNTIME_ARRAY_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/ArrayPrototype.h>
 
 namespace JSC {
index f90460b..c0c9f16 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef RUNTIME_FUNCTION_H_
 #define RUNTIME_FUNCTION_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/InternalFunction.h>
 #include <runtime/JSGlobalObject.h>
 #include <wtf/OwnPtr.h>
index 52124c6..0decd17 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef KJS_RUNTIME_OBJECT_H
 #define KJS_RUNTIME_OBJECT_H
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSObjectWithGlobalObject.h>
 
index 2cb5685..2796754 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "runtime_root.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_object.h"
 #include <runtime/JSGlobalObject.h>
 #include <wtf/HashCountedSet.h>
index bcba115..2f5b1ae 100644 (file)
@@ -20,7 +20,7 @@
  */
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JSObject.h"
 #include "JSValue.h"
 #include "interpreter.h"
index 31564a8..ef3bc4e 100644 (file)
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <Foundation/Foundation.h>
 #include "JSObject.h"
 #include "JSValue.h"
index 34841ed..20bf88a 100644 (file)
@@ -24,7 +24,7 @@
  */
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JSObject.h"
 #include "JSValue.h"
 #include "interpreter.h"
index 2b5435d..d405f10 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "FrameWin.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Document.h"
 #include "FloatRect.h"
 #include "PrintContext.h"
index 6fb262d..af0084e 100644 (file)
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "MediaPlayerProxy.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "DocumentLoader.h"
 #include "HTMLPlugInElement.h"
 #include "HTMLVideoElement.h"
index b1b8e7c..14a8071 100644 (file)
@@ -29,7 +29,7 @@
 #include "PluginView.h"
 
 #if USE(JSC)
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #endif
 #include "Chrome.h"
 #include "CookieJar.h"
index 9752efc..383ac49 100644 (file)
@@ -27,7 +27,7 @@
 #include "PluginView.h"
 
 #if USE(JSC)
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/ScopeChain.h>
 #endif
 
index 66f9b43..2eed3a4 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "PluginView.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Element.h"
@@ -908,4 +908,3 @@ void PluginView::restart()
 }
 
 } // namespace WebCore
-
index 7119f0d..aaf4844 100644 (file)
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "PluginView.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Element.h"
index b195e5c..611abb9 100644 (file)
@@ -29,7 +29,7 @@
 #include "PluginView.h"
 
 #if USE(JSC)
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #endif
 #include "Chrome.h"
 #include "ChromeClient.h"
index f3eb033..1a9a9ca 100644 (file)
@@ -19,7 +19,7 @@
 #include "config.h"
 #include "PluginView.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Element.h"
index 674ef1b..208121e 100644 (file)
@@ -29,7 +29,7 @@
 #include "PluginView.h"
 
 #include "BitmapImage.h"
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
 #include "Document.h"
index e0914b6..bff011b 100644 (file)
@@ -1,3 +1,15 @@
+2011-02-25 Steve Block <steveblock@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Bridge.h should not include BridgeJSC.h
+        https://bugs.webkit.org/show_bug.cgi?id=55212
+
+        Include BridgeJSC.h directly instead.
+
+        * Plugins/Hosted/ProxyInstance.h:
+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+
 2011-02-28  Chang Shu  <cshu@webkit.org>
 
         Reviewed by Ryosuke Niwa.
index b72e49a..65f3a51 100644 (file)
@@ -30,7 +30,7 @@
 
 #import "NetscapePluginInstanceProxy.h"
 #import "WebKitPluginHostTypes.h"
-#import <WebCore/Bridge.h>
+#import <WebCore/BridgeJSC.h>
 #import <WebCore/runtime_root.h>
 #import <wtf/OwnPtr.h>
 
index 7effb61..d3cce46 100644 (file)
@@ -38,7 +38,7 @@
 #import "WebUIDelegate.h"
 
 #import <CoreFoundation/CoreFoundation.h>
-#import <WebCore/Bridge.h>
+#import <WebCore/BridgeJSC.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoaderTypes.h>
 #import <WebCore/FrameView.h>
index 5706ee6..6f98bca 100644 (file)
@@ -22,7 +22,7 @@
 #include "qwebframe.h"
 
 #if USE(JSC)
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "CallFrame.h"
 #elif USE(V8)
 #include "V8Binding.h"
index 25b92dd..fe941a6 100644 (file)
@@ -1,3 +1,14 @@
+2011-02-25 Steve Block <steveblock@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Bridge.h should not include BridgeJSC.h
+        https://bugs.webkit.org/show_bug.cgi?id=55212
+
+        Include BridgeJSC.h directly instead.
+
+        * Api/qwebframe.cpp:
+
 2011-02-28  Chang Shu  <cshu@webkit.org>
 
         Reviewed by Ryosuke Niwa.