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/WebCore/bridge/qt/qt_class.h         | 2 +-
 Source/WebCore/bridge/qt/qt_instance.h      | 2 +-
 Source/WebCore/bridge/qt/qt_pixmapruntime.h | 2 +-
 Source/WebCore/bridge/qt/qt_runtime.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Source/WebCore/bridge/qt')

diff --git a/Source/WebCore/bridge/qt/qt_class.h b/Source/WebCore/bridge/qt/qt_class.h
index 9d55cc5..4c1a753 100644
--- a/Source/WebCore/bridge/qt/qt_class.h
+++ b/Source/WebCore/bridge/qt/qt_class.h
@@ -20,7 +20,7 @@
 #ifndef qt_class_h
 #define qt_class_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "qglobal.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/Source/WebCore/bridge/qt/qt_instance.h b/Source/WebCore/bridge/qt/qt_instance.h
index dd24a92..25aea53 100644
--- a/Source/WebCore/bridge/qt/qt_instance.h
+++ b/Source/WebCore/bridge/qt/qt_instance.h
@@ -20,7 +20,7 @@
 #ifndef qt_instance_h
 #define qt_instance_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_root.h"
 #include <QtScript/qscriptengine.h>
 #include <qhash.h>
diff --git a/Source/WebCore/bridge/qt/qt_pixmapruntime.h b/Source/WebCore/bridge/qt/qt_pixmapruntime.h
index e2ae5e9..b474efd 100644
--- a/Source/WebCore/bridge/qt/qt_pixmapruntime.h
+++ b/Source/WebCore/bridge/qt/qt_pixmapruntime.h
@@ -20,7 +20,7 @@
 #ifndef qt_pixmapruntime_h
 #define qt_pixmapruntime_h
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <QVariant>
 
 namespace JSC {
diff --git a/Source/WebCore/bridge/qt/qt_runtime.h b/Source/WebCore/bridge/qt/qt_runtime.h
index 68bf865..8dab08c 100644
--- a/Source/WebCore/bridge/qt/qt_runtime.h
+++ b/Source/WebCore/bridge/qt/qt_runtime.h
@@ -20,7 +20,7 @@
 #ifndef BINDINGS_QT_RUNTIME_H_
 #define BINDINGS_QT_RUNTIME_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "Completion.h"
 #include "Protect.h"
 #include "runtime_method.h"
-- 
cgit v1.1