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

4 files changed, 9 insertions, 3 deletions

diff --git a/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.h b/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.h
index 64dad69..4b40c46 100644
--- a/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.h
+++ b/Source/WebKit/android/WebCoreSupport/UrlInterceptResponse.h
@@ -38,7 +38,8 @@ namespace android {
 
 class JavaInputStreamWrapper;
 
-class UrlInterceptResponse : public Noncopyable {
+class UrlInterceptResponse {
+    WTF_MAKE_NONCOPYABLE(UrlInterceptResponse);
 public:
     UrlInterceptResponse(JNIEnv* env, jobject response);
     ~UrlInterceptResponse();
diff --git a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h
index 97e478e..4dbd8ba 100644
--- a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h
+++ b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.h
@@ -66,8 +66,9 @@ private:
     OwnPtr<webkit_glue::FormField> mField;
 };
 
-class WebAutoFill : public Noncopyable
+class WebAutoFill
 {
+    WTF_MAKE_NONCOPYABLE(WebAutoFill);
 public:
     WebAutoFill();
     virtual ~WebAutoFill();
diff --git a/Source/WebKit/android/plugins/PluginTimer.h b/Source/WebKit/android/plugins/PluginTimer.h
index 20c0816..231dca5 100644
--- a/Source/WebKit/android/plugins/PluginTimer.h
+++ b/Source/WebKit/android/plugins/PluginTimer.h
@@ -27,6 +27,7 @@
 #ifndef PluginTimer_H
 #define PluginTimer_H
 
+#include "FastAllocBase.h"
 #include "RefCounted.h"
 #include "Timer.h"
 #include "npapi.h"
@@ -36,6 +37,7 @@ namespace WebCore {
     class PluginTimerList;
 
     class PluginTimer : public TimerBase, public RefCounted<PluginTimer> {
+        WTF_MAKE_FAST_ALLOCATED;
     public:
         PluginTimer(PluginTimer** list, NPP instance, bool repeat,
                     void (*proc)(NPP npp, uint32_t timerID));
diff --git a/Source/WebKit/android/wds/DebugServer.h b/Source/WebKit/android/wds/DebugServer.h
index 92edad9..3d7a539 100644
--- a/Source/WebKit/android/wds/DebugServer.h
+++ b/Source/WebKit/android/wds/DebugServer.h
@@ -29,6 +29,7 @@
 // Turn on the wds feature in webkit
 #define ENABLE_WDS 0
 
+#include "wtf/Noncopyable.h"
 #include "wtf/Threading.h"
 #include "wtf/Vector.h"
 
@@ -45,7 +46,8 @@ namespace android {
 // WebCore Debug Server
 namespace WDS {
 
-class DebugServer : WTFNoncopyable::Noncopyable {
+class DebugServer {
+    WTF_MAKE_NONCOPYABLE(DebugServer);
 public:
     void start();
     void addFrame(Frame* frame) {