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/rendering/ColumnInfo.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/rendering/ColumnInfo.h')

diff --git a/Source/WebCore/rendering/ColumnInfo.h b/Source/WebCore/rendering/ColumnInfo.h
index 5e6f619..d77d6ca 100644
--- a/Source/WebCore/rendering/ColumnInfo.h
+++ b/Source/WebCore/rendering/ColumnInfo.h
@@ -31,7 +31,8 @@
 
 namespace WebCore {
 
-class ColumnInfo : public Noncopyable {
+class ColumnInfo {
+    WTF_MAKE_NONCOPYABLE(ColumnInfo); WTF_MAKE_FAST_ALLOCATED;
 public:
     ColumnInfo()
         : m_desiredColumnWidth(0)
-- 
cgit v1.1