diff options
author | Ben Murdoch <benm@google.com> | 2011-05-20 16:48:45 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:18 +0100 |
commit | 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 (patch) | |
tree | 1ba5405cbf0bf31341e2e260a7ed05c9dcce8e4b /Source/WebCore | |
parent | 9bbecbe38e6249c7b1c0874e80503f6162f13613 (diff) | |
download | external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.zip external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.gz external_webkit-53733164eb6cabab5a1eddcabb42e4ce27eb0e44.tar.bz2 |
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
Diffstat (limited to 'Source/WebCore')
38 files changed, 39 insertions, 39 deletions
diff --git a/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp b/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp index 893b967..26bb05d 100644 --- a/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp +++ b/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp @@ -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" diff --git a/Source/WebCore/bindings/js/ScriptControllerBrew.cpp b/Source/WebCore/bindings/js/ScriptControllerBrew.cpp index d8d345a..51dee24 100644 --- a/Source/WebCore/bindings/js/ScriptControllerBrew.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerBrew.cpp @@ -29,7 +29,7 @@ #include "config.h" #include "ScriptController.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "PluginView.h" #include "runtime_root.h" diff --git a/Source/WebCore/bindings/js/ScriptControllerGtk.cpp b/Source/WebCore/bindings/js/ScriptControllerGtk.cpp index 6ffae69..886f110 100644 --- a/Source/WebCore/bindings/js/ScriptControllerGtk.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerGtk.cpp @@ -31,7 +31,7 @@ #include "config.h" #include "ScriptController.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "PluginView.h" #include "runtime_root.h" diff --git a/Source/WebCore/bindings/js/ScriptControllerHaiku.cpp b/Source/WebCore/bindings/js/ScriptControllerHaiku.cpp index a1f1590..22d55a2 100644 --- a/Source/WebCore/bindings/js/ScriptControllerHaiku.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerHaiku.cpp @@ -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 - diff --git a/Source/WebCore/bindings/js/ScriptControllerMac.mm b/Source/WebCore/bindings/js/ScriptControllerMac.mm index 7c29bfc..f7ad3ff 100644 --- a/Source/WebCore/bindings/js/ScriptControllerMac.mm +++ b/Source/WebCore/bindings/js/ScriptControllerMac.mm @@ -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" diff --git a/Source/WebCore/bindings/js/ScriptControllerQt.cpp b/Source/WebCore/bindings/js/ScriptControllerQt.cpp index ee7ceff..a8cdf9d 100644 --- a/Source/WebCore/bindings/js/ScriptControllerQt.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerQt.cpp @@ -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" diff --git a/Source/WebCore/bindings/js/ScriptControllerWin.cpp b/Source/WebCore/bindings/js/ScriptControllerWin.cpp index e0a959e..9780c93 100644 --- a/Source/WebCore/bindings/js/ScriptControllerWin.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerWin.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "ScriptController.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "PluginView.h" using namespace JSC::Bindings; diff --git a/Source/WebCore/bindings/js/ScriptControllerWx.cpp b/Source/WebCore/bindings/js/ScriptControllerWx.cpp index 1d7b4ca..632f63c 100644 --- a/Source/WebCore/bindings/js/ScriptControllerWx.cpp +++ b/Source/WebCore/bindings/js/ScriptControllerWx.cpp @@ -27,7 +27,7 @@ #include "config.h" #include "ScriptController.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "PluginView.h" #include "runtime_root.h" diff --git a/Source/WebCore/bindings/js/ScriptInstance.h b/Source/WebCore/bindings/js/ScriptInstance.h index 0b3b59f..d4245b1 100644 --- a/Source/WebCore/bindings/js/ScriptInstance.h +++ b/Source/WebCore/bindings/js/ScriptInstance.h @@ -31,7 +31,7 @@ #ifndef ScriptInstance_h #define ScriptInstance_h -#include "Bridge.h" +#include "BridgeJSC.h" #include <wtf/RefPtr.h> namespace WebCore { diff --git a/Source/WebCore/bindings/objc/WebScriptObject.mm b/Source/WebCore/bindings/objc/WebScriptObject.mm index 6bf7afe..ba28d85 100644 --- a/Source/WebCore/bindings/objc/WebScriptObject.mm +++ b/Source/WebCore/bindings/objc/WebScriptObject.mm @@ -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" diff --git a/Source/WebCore/bridge/Bridge.h b/Source/WebCore/bridge/Bridge.h index 00d6f36..ff3c7f8 100644 --- a/Source/WebCore/bridge/Bridge.h +++ b/Source/WebCore/bridge/Bridge.h @@ -27,7 +27,8 @@ #ifndef Bridge_h #define Bridge_h -#include "BridgeJSC.h" +#include <wtf/FastAllocBase.h> +#include <wtf/Noncopyable.h> namespace JSC { diff --git a/Source/WebCore/bridge/c/c_class.h b/Source/WebCore/bridge/c/c_class.h index 52db2b9..0ee88cf 100644 --- a/Source/WebCore/bridge/c/c_class.h +++ b/Source/WebCore/bridge/c/c_class.h @@ -28,7 +28,7 @@ #if ENABLE(NETSCAPE_PLUGIN_API) -#include "Bridge.h" +#include "BridgeJSC.h" #include "npruntime_internal.h" #include <wtf/HashMap.h> diff --git a/Source/WebCore/bridge/c/c_instance.h b/Source/WebCore/bridge/c/c_instance.h index cc1a806..a525a7a 100644 --- a/Source/WebCore/bridge/c/c_instance.h +++ b/Source/WebCore/bridge/c/c_instance.h @@ -28,7 +28,7 @@ #if ENABLE(NETSCAPE_PLUGIN_API) -#include "Bridge.h" +#include "BridgeJSC.h" #include "runtime_root.h" #include <wtf/PassRefPtr.h> diff --git a/Source/WebCore/bridge/c/c_runtime.h b/Source/WebCore/bridge/c/c_runtime.h index 5355934..47b7cee 100644 --- a/Source/WebCore/bridge/c/c_runtime.h +++ b/Source/WebCore/bridge/c/c_runtime.h @@ -28,7 +28,7 @@ #if ENABLE(NETSCAPE_PLUGIN_API) -#include "Bridge.h" +#include "BridgeJSC.h" #include "npruntime_internal.h" namespace JSC { diff --git a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h index afb1bce..39f64e2 100644 --- a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h @@ -29,7 +29,7 @@ #if ENABLE(JAVA_BRIDGE) -#include "Bridge.h" +#include "BridgeJSC.h" #include "JNIBridge.h" #include <JavaVM/jni.h> diff --git a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h index dbfcf75..004635d 100644 --- a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h +++ b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h @@ -28,7 +28,7 @@ #if ENABLE(JAVA_BRIDGE) -#include "Bridge.h" +#include "BridgeJSC.h" #include "runtime_root.h" #include <JavaVM/jni.h> diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.h b/Source/WebCore/bridge/jsc/BridgeJSC.h index ebcfaad..bb5a379 100644 --- a/Source/WebCore/bridge/jsc/BridgeJSC.h +++ b/Source/WebCore/bridge/jsc/BridgeJSC.h @@ -29,6 +29,7 @@ #if USE(JSC) +#include "Bridge.h" #include <runtime/JSString.h> #include <wtf/HashMap.h> #include <wtf/RefCounted.h> diff --git a/Source/WebCore/bridge/objc/objc_runtime.h b/Source/WebCore/bridge/objc/objc_runtime.h index 60fbdac..450b985 100644 --- a/Source/WebCore/bridge/objc/objc_runtime.h +++ b/Source/WebCore/bridge/objc/objc_runtime.h @@ -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> diff --git a/Source/WebCore/bridge/qt/qt_class.h b/Source/WebCore/bridge/qt/qt_class.h index 9d55cc5..4c1a753 100644 --- a/Source/WebCore/bridge/qt/qt_class.h +++ b/Source/WebCore/bridge/qt/qt_class.h @@ -20,7 +20,7 @@ #ifndef qt_class_h #define qt_class_h -#include "Bridge.h" +#include "BridgeJSC.h" #include "qglobal.h" QT_BEGIN_NAMESPACE diff --git a/Source/WebCore/bridge/qt/qt_instance.h b/Source/WebCore/bridge/qt/qt_instance.h index dd24a92..25aea53 100644 --- a/Source/WebCore/bridge/qt/qt_instance.h +++ b/Source/WebCore/bridge/qt/qt_instance.h @@ -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> diff --git a/Source/WebCore/bridge/qt/qt_pixmapruntime.h b/Source/WebCore/bridge/qt/qt_pixmapruntime.h index e2ae5e9..b474efd 100644 --- a/Source/WebCore/bridge/qt/qt_pixmapruntime.h +++ b/Source/WebCore/bridge/qt/qt_pixmapruntime.h @@ -20,7 +20,7 @@ #ifndef qt_pixmapruntime_h #define qt_pixmapruntime_h -#include "Bridge.h" +#include "BridgeJSC.h" #include <QVariant> namespace JSC { diff --git a/Source/WebCore/bridge/qt/qt_runtime.h b/Source/WebCore/bridge/qt/qt_runtime.h index 68bf865..8dab08c 100644 --- a/Source/WebCore/bridge/qt/qt_runtime.h +++ b/Source/WebCore/bridge/qt/qt_runtime.h @@ -20,7 +20,7 @@ #ifndef BINDINGS_QT_RUNTIME_H_ #define BINDINGS_QT_RUNTIME_H_ -#include "Bridge.h" +#include "BridgeJSC.h" #include "Completion.h" #include "Protect.h" #include "runtime_method.h" diff --git a/Source/WebCore/bridge/runtime_array.h b/Source/WebCore/bridge/runtime_array.h index e301268..f7b67bf 100644 --- a/Source/WebCore/bridge/runtime_array.h +++ b/Source/WebCore/bridge/runtime_array.h @@ -26,7 +26,7 @@ #ifndef RUNTIME_ARRAY_H_ #define RUNTIME_ARRAY_H_ -#include "Bridge.h" +#include "BridgeJSC.h" #include <runtime/ArrayPrototype.h> namespace JSC { diff --git a/Source/WebCore/bridge/runtime_method.h b/Source/WebCore/bridge/runtime_method.h index 96d12aa..27bc663 100644 --- a/Source/WebCore/bridge/runtime_method.h +++ b/Source/WebCore/bridge/runtime_method.h @@ -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> diff --git a/Source/WebCore/bridge/runtime_object.h b/Source/WebCore/bridge/runtime_object.h index 64c8049..fc9baf1 100644 --- a/Source/WebCore/bridge/runtime_object.h +++ b/Source/WebCore/bridge/runtime_object.h @@ -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> diff --git a/Source/WebCore/bridge/runtime_root.cpp b/Source/WebCore/bridge/runtime_root.cpp index 796354f..515636d 100644 --- a/Source/WebCore/bridge/runtime_root.cpp +++ b/Source/WebCore/bridge/runtime_root.cpp @@ -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> diff --git a/Source/WebCore/bridge/testbindings.cpp b/Source/WebCore/bridge/testbindings.cpp index bcba115..2f5b1ae 100644 --- a/Source/WebCore/bridge/testbindings.cpp +++ b/Source/WebCore/bridge/testbindings.cpp @@ -20,7 +20,7 @@ */ #include "config.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "JSObject.h" #include "JSValue.h" #include "interpreter.h" diff --git a/Source/WebCore/bridge/testbindings.mm b/Source/WebCore/bridge/testbindings.mm index 31564a8..ef3bc4e 100644 --- a/Source/WebCore/bridge/testbindings.mm +++ b/Source/WebCore/bridge/testbindings.mm @@ -25,7 +25,7 @@ #include "config.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include <Foundation/Foundation.h> #include "JSObject.h" #include "JSValue.h" diff --git a/Source/WebCore/bridge/testqtbindings.cpp b/Source/WebCore/bridge/testqtbindings.cpp index 73df155..592415e 100644 --- a/Source/WebCore/bridge/testqtbindings.cpp +++ b/Source/WebCore/bridge/testqtbindings.cpp @@ -24,7 +24,7 @@ */ #include "config.h" -#include "Bridge.h" +#include "BridgeJSC.h" #include "JSObject.h" #include "JSValue.h" #include "interpreter.h" diff --git a/Source/WebCore/page/win/FrameWin.cpp b/Source/WebCore/page/win/FrameWin.cpp index 2b5435d..d405f10 100644 --- a/Source/WebCore/page/win/FrameWin.cpp +++ b/Source/WebCore/page/win/FrameWin.cpp @@ -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" diff --git a/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp b/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp index 6fb262d..af0084e 100644 --- a/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp +++ b/Source/WebCore/platform/graphics/wince/MediaPlayerProxy.cpp @@ -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" diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index f06daf4..1fefe19 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -29,7 +29,7 @@ #include "PluginView.h" #if USE(JSC) -#include "Bridge.h" +#include "BridgeJSC.h" #endif #include "Chrome.h" #include "CookieJar.h" diff --git a/Source/WebCore/plugins/PluginViewNone.cpp b/Source/WebCore/plugins/PluginViewNone.cpp index 9aeaf3b..978e5ee 100644 --- a/Source/WebCore/plugins/PluginViewNone.cpp +++ b/Source/WebCore/plugins/PluginViewNone.cpp @@ -27,7 +27,7 @@ #include "PluginView.h" #if USE(JSC) -#include "Bridge.h" +#include "BridgeJSC.h" #endif using namespace WTF; diff --git a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp index ec855a2..5166151 100644 --- a/Source/WebCore/plugins/gtk/PluginViewGtk.cpp +++ b/Source/WebCore/plugins/gtk/PluginViewGtk.cpp @@ -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" @@ -898,4 +898,3 @@ void PluginView::restart() } } // namespace WebCore - diff --git a/Source/WebCore/plugins/mac/PluginViewMac.mm b/Source/WebCore/plugins/mac/PluginViewMac.mm index 7119f0d..aaf4844 100644 --- a/Source/WebCore/plugins/mac/PluginViewMac.mm +++ b/Source/WebCore/plugins/mac/PluginViewMac.mm @@ -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" diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp index 6cf36e9..579f77d 100644 --- a/Source/WebCore/plugins/qt/PluginViewQt.cpp +++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp @@ -29,7 +29,7 @@ #include "PluginView.h" #if USE(JSC) -#include "Bridge.h" +#include "BridgeJSC.h" #endif #include "Chrome.h" #include "ChromeClient.h" diff --git a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp index f3eb033..1a9a9ca 100644 --- a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp +++ b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp @@ -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" diff --git a/Source/WebCore/plugins/win/PluginViewWin.cpp b/Source/WebCore/plugins/win/PluginViewWin.cpp index 758d90a..3cd1902 100644 --- a/Source/WebCore/plugins/win/PluginViewWin.cpp +++ b/Source/WebCore/plugins/win/PluginViewWin.cpp @@ -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" |