From 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 20 May 2011 16:48:45 +0100 Subject: 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 --- Source/WebCore/bindings/js/JSPluginElementFunctions.cpp | 2 +- Source/WebCore/bindings/js/ScriptControllerBrew.cpp | 2 +- Source/WebCore/bindings/js/ScriptControllerGtk.cpp | 2 +- Source/WebCore/bindings/js/ScriptControllerHaiku.cpp | 3 +-- Source/WebCore/bindings/js/ScriptControllerMac.mm | 2 +- Source/WebCore/bindings/js/ScriptControllerQt.cpp | 2 +- Source/WebCore/bindings/js/ScriptControllerWin.cpp | 2 +- Source/WebCore/bindings/js/ScriptControllerWx.cpp | 2 +- Source/WebCore/bindings/js/ScriptInstance.h | 2 +- Source/WebCore/bindings/objc/WebScriptObject.mm | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/bindings') 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 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 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" -- cgit v1.1