From 0cae2b1e7dd111cf7081b49cf7411c0066b33cc6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 18:01:30 +0100
Subject: Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBase

Upstream now uses macros rather than inheritance for classes
declard Noncopyable or Fast Allocated.

Note that in the case of PluginTimer and ClipboardAndroid we
now need to explicitly declare them fast allocated. This is
because previously they got the fast allocated methods through
a common superclass (FastAllocBase) but now both parents provide
implementations, so there is an ambiguity the compiler cannot
resolve.

See http://trac.webkit.org/changeset/76248

Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
---
 Source/WebCore/platform/android/ClipboardAndroid.h | 1 +
 Source/WebCore/platform/android/PackageNotifier.h  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'Source/WebCore/platform/android')

diff --git a/Source/WebCore/platform/android/ClipboardAndroid.h b/Source/WebCore/platform/android/ClipboardAndroid.h
index 807653b..86be8f0 100644
--- a/Source/WebCore/platform/android/ClipboardAndroid.h
+++ b/Source/WebCore/platform/android/ClipboardAndroid.h
@@ -36,6 +36,7 @@ namespace WebCore {
 class CachedImage;
 
 class ClipboardAndroid : public Clipboard, public CachedResourceClient {
+    WTF_MAKE_FAST_ALLOCATED;
 public:
     ClipboardAndroid(ClipboardAccessPolicy policy, ClipboardType);
     ~ClipboardAndroid();
diff --git a/Source/WebCore/platform/android/PackageNotifier.h b/Source/WebCore/platform/android/PackageNotifier.h
index 8191d84..2303f84 100644
--- a/Source/WebCore/platform/android/PackageNotifier.h
+++ b/Source/WebCore/platform/android/PackageNotifier.h
@@ -37,7 +37,8 @@
 
 namespace WebCore {
 
-class PackageNotifier : public Noncopyable {
+class PackageNotifier {
+    WTF_MAKE_NONCOPYABLE(PackageNotifier);
 public:
     PackageNotifier();
 
-- 
cgit v1.1