From 53733164eb6cabab5a1eddcabb42e4ce27eb0e44 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
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/WebKit/mac/Plugins/Hosted/ProxyInstance.h                | 2 +-
 Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm | 2 +-
 Source/WebKit/qt/Api/qwebframe.cpp                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/WebKit')

diff --git a/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h b/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
index b72e49a..65f3a51 100644
--- a/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
+++ b/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.h
@@ -30,7 +30,7 @@
 
 #import "NetscapePluginInstanceProxy.h"
 #import "WebKitPluginHostTypes.h"
-#import <WebCore/Bridge.h>
+#import <WebCore/BridgeJSC.h>
 #import <WebCore/runtime_root.h>
 #import <wtf/OwnPtr.h>
 
diff --git a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
index 5593050..c3ee98b 100644
--- a/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
+++ b/Source/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm
@@ -38,7 +38,7 @@
 #import "WebUIDelegate.h"
 
 #import <CoreFoundation/CoreFoundation.h>
-#import <WebCore/Bridge.h>
+#import <WebCore/BridgeJSC.h>
 #import <WebCore/Frame.h>
 #import <WebCore/FrameLoaderTypes.h>
 #import <WebCore/FrameView.h>
diff --git a/Source/WebKit/qt/Api/qwebframe.cpp b/Source/WebKit/qt/Api/qwebframe.cpp
index 0d502b3..391ff26 100644
--- a/Source/WebKit/qt/Api/qwebframe.cpp
+++ b/Source/WebKit/qt/Api/qwebframe.cpp
@@ -22,7 +22,7 @@
 #include "qwebframe.h"
 
 #if USE(JSC)
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "CallFrame.h"
 #elif USE(V8)
 #include "V8Binding.h"
-- 
cgit v1.1