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/plugins | |
| 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/plugins')
| -rw-r--r-- | Source/WebCore/plugins/PluginView.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/plugins/PluginViewNone.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/plugins/gtk/PluginViewGtk.cpp | 3 | ||||
| -rw-r--r-- | Source/WebCore/plugins/mac/PluginViewMac.mm | 2 | ||||
| -rw-r--r-- | Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/plugins/symbian/PluginViewSymbian.cpp | 2 | ||||
| -rw-r--r-- | Source/WebCore/plugins/win/PluginViewWin.cpp | 2 |
7 files changed, 7 insertions, 8 deletions
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" |