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/bindings/js | |
| 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/bindings/js')
9 files changed, 9 insertions, 10 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 { |