From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 16:25:10 +0100
Subject: Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
---
 Source/WebCore/bridge/jsc/BridgeJSC.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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

diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.h b/Source/WebCore/bridge/jsc/BridgeJSC.h
index 96974d9..ebcfaad 100644
--- a/Source/WebCore/bridge/jsc/BridgeJSC.h
+++ b/Source/WebCore/bridge/jsc/BridgeJSC.h
@@ -59,8 +59,10 @@ public:
     virtual ~Field() { }
 };
 
-class Class : public Noncopyable {
+class Class {
+    WTF_MAKE_NONCOPYABLE(Class); WTF_MAKE_FAST_ALLOCATED;
 public:
+    Class() { }
     virtual MethodList methodsNamed(const Identifier&, Instance*) const = 0;
     virtual Field* fieldNamed(const Identifier&, Instance*) const = 0;
     virtual JSValue fallbackObject(ExecState*, Instance*, const Identifier&) { return jsUndefined(); }
@@ -125,7 +127,8 @@ private:
     WeakGCPtr<RuntimeObject> m_runtimeObject;
 };
 
-class Array : public Noncopyable {
+class Array {
+    WTF_MAKE_NONCOPYABLE(Array);
 public:
     Array(PassRefPtr<RootObject>);
     virtual ~Array();
-- 
cgit v1.1