diff options
7 files changed, 14 insertions, 5 deletions
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(); diff --git a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h index 3514ae7..b03afa9 100644 --- a/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h +++ b/Source/WebCore/platform/graphics/android/FontCustomPlatformData.h @@ -38,7 +38,8 @@ namespace WebCore { class FontPlatformData; class SharedBuffer; -class FontCustomPlatformData : public Noncopyable { +class FontCustomPlatformData { + WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); public: FontCustomPlatformData(SkTypeface* face); ~FontCustomPlatformData(); 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) { |