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/bridge/c/c_class.h | 2 +- Source/WebCore/bridge/c/c_instance.h | 2 +- Source/WebCore/bridge/c/c_runtime.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/WebCore/bridge/c') 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 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 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 { -- cgit v1.1