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/Bridge.h                  | 3 ++-
 Source/WebCore/bridge/c/c_class.h               | 2 +-
 Source/WebCore/bridge/c/c_instance.h            | 2 +-
 Source/WebCore/bridge/c/c_runtime.h             | 2 +-
 Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h    | 2 +-
 Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h | 2 +-
 Source/WebCore/bridge/jsc/BridgeJSC.h           | 1 +
 Source/WebCore/bridge/objc/objc_runtime.h       | 2 +-
 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 +-
 Source/WebCore/bridge/runtime_array.h           | 2 +-
 Source/WebCore/bridge/runtime_method.h          | 2 +-
 Source/WebCore/bridge/runtime_object.h          | 2 +-
 Source/WebCore/bridge/runtime_root.cpp          | 2 +-
 Source/WebCore/bridge/testbindings.cpp          | 2 +-
 Source/WebCore/bridge/testbindings.mm           | 2 +-
 Source/WebCore/bridge/testqtbindings.cpp        | 2 +-
 19 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'Source/WebCore/bridge')

diff --git a/Source/WebCore/bridge/Bridge.h b/Source/WebCore/bridge/Bridge.h
index 00d6f36..ff3c7f8 100644
--- a/Source/WebCore/bridge/Bridge.h
+++ b/Source/WebCore/bridge/Bridge.h
@@ -27,7 +27,8 @@
 #ifndef Bridge_h
 #define Bridge_h
 
-#include "BridgeJSC.h"
+#include <wtf/FastAllocBase.h>
+#include <wtf/Noncopyable.h>
 
 namespace JSC  {
 
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 <wtf/HashMap.h>
 
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 <wtf/PassRefPtr.h>
 
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 {
diff --git a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h
index afb1bce..39f64e2 100644
--- a/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h
+++ b/Source/WebCore/bridge/jni/jsc/JNIBridgeJSC.h
@@ -29,7 +29,7 @@
 
 #if ENABLE(JAVA_BRIDGE)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JNIBridge.h"
 #include <JavaVM/jni.h>
 
diff --git a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
index dbfcf75..004635d 100644
--- a/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
+++ b/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.h
@@ -28,7 +28,7 @@
 
 #if ENABLE(JAVA_BRIDGE)
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_root.h"
 
 #include <JavaVM/jni.h>
diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.h b/Source/WebCore/bridge/jsc/BridgeJSC.h
index ebcfaad..bb5a379 100644
--- a/Source/WebCore/bridge/jsc/BridgeJSC.h
+++ b/Source/WebCore/bridge/jsc/BridgeJSC.h
@@ -29,6 +29,7 @@
 
 #if USE(JSC)
 
+#include "Bridge.h"
 #include <runtime/JSString.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
diff --git a/Source/WebCore/bridge/objc/objc_runtime.h b/Source/WebCore/bridge/objc/objc_runtime.h
index 60fbdac..450b985 100644
--- a/Source/WebCore/bridge/objc/objc_runtime.h
+++ b/Source/WebCore/bridge/objc/objc_runtime.h
@@ -26,7 +26,7 @@
 #ifndef KJS_BINDINGS_OBJC_RUNTIME_H
 #define KJS_BINDINGS_OBJC_RUNTIME_H
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "objc_header.h"
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSObjectWithGlobalObject.h>
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"
diff --git a/Source/WebCore/bridge/runtime_array.h b/Source/WebCore/bridge/runtime_array.h
index e301268..f7b67bf 100644
--- a/Source/WebCore/bridge/runtime_array.h
+++ b/Source/WebCore/bridge/runtime_array.h
@@ -26,7 +26,7 @@
 #ifndef RUNTIME_ARRAY_H_
 #define RUNTIME_ARRAY_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/ArrayPrototype.h>
 
 namespace JSC {
diff --git a/Source/WebCore/bridge/runtime_method.h b/Source/WebCore/bridge/runtime_method.h
index 96d12aa..27bc663 100644
--- a/Source/WebCore/bridge/runtime_method.h
+++ b/Source/WebCore/bridge/runtime_method.h
@@ -26,7 +26,7 @@
 #ifndef RUNTIME_FUNCTION_H_
 #define RUNTIME_FUNCTION_H_
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/InternalFunction.h>
 #include <runtime/JSGlobalObject.h>
 #include <wtf/OwnPtr.h>
diff --git a/Source/WebCore/bridge/runtime_object.h b/Source/WebCore/bridge/runtime_object.h
index 64c8049..fc9baf1 100644
--- a/Source/WebCore/bridge/runtime_object.h
+++ b/Source/WebCore/bridge/runtime_object.h
@@ -26,7 +26,7 @@
 #ifndef KJS_RUNTIME_OBJECT_H
 #define KJS_RUNTIME_OBJECT_H
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSObjectWithGlobalObject.h>
 
diff --git a/Source/WebCore/bridge/runtime_root.cpp b/Source/WebCore/bridge/runtime_root.cpp
index 796354f..515636d 100644
--- a/Source/WebCore/bridge/runtime_root.cpp
+++ b/Source/WebCore/bridge/runtime_root.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "runtime_root.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "runtime_object.h"
 #include <runtime/JSGlobalObject.h>
 #include <wtf/HashCountedSet.h>
diff --git a/Source/WebCore/bridge/testbindings.cpp b/Source/WebCore/bridge/testbindings.cpp
index bcba115..2f5b1ae 100644
--- a/Source/WebCore/bridge/testbindings.cpp
+++ b/Source/WebCore/bridge/testbindings.cpp
@@ -20,7 +20,7 @@
  */
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JSObject.h"
 #include "JSValue.h"
 #include "interpreter.h"
diff --git a/Source/WebCore/bridge/testbindings.mm b/Source/WebCore/bridge/testbindings.mm
index 31564a8..ef3bc4e 100644
--- a/Source/WebCore/bridge/testbindings.mm
+++ b/Source/WebCore/bridge/testbindings.mm
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include <Foundation/Foundation.h>
 #include "JSObject.h"
 #include "JSValue.h"
diff --git a/Source/WebCore/bridge/testqtbindings.cpp b/Source/WebCore/bridge/testqtbindings.cpp
index 73df155..592415e 100644
--- a/Source/WebCore/bridge/testqtbindings.cpp
+++ b/Source/WebCore/bridge/testqtbindings.cpp
@@ -24,7 +24,7 @@
  */
 #include "config.h"
 
-#include "Bridge.h"
+#include "BridgeJSC.h"
 #include "JSObject.h"
 #include "JSValue.h"
 #include "interpreter.h"
-- 
cgit v1.1