diff options
author | Ben Murdoch <benm@google.com> | 2011-05-16 16:25:10 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-05-23 18:54:14 +0100 |
commit | ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb (patch) | |
tree | db769fadd053248f85db67434a5b275224defef7 /Source/WebCore/fileapi | |
parent | 52e2557aeb8477967e97fd24f20f8f407a10fa15 (diff) | |
download | external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.zip external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.gz external_webkit-ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb.tar.bz2 |
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Diffstat (limited to 'Source/WebCore/fileapi')
-rw-r--r-- | Source/WebCore/fileapi/FileThread.h | 3 | ||||
-rw-r--r-- | Source/WebCore/fileapi/LocalFileSystem.h | 3 | ||||
-rw-r--r-- | Source/WebCore/fileapi/SyncCallbackHelper.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebCore/fileapi/FileThread.h b/Source/WebCore/fileapi/FileThread.h index d7aabf7..45205c4 100644 --- a/Source/WebCore/fileapi/FileThread.h +++ b/Source/WebCore/fileapi/FileThread.h @@ -54,7 +54,8 @@ public: bool start(); void stop(); - class Task : public Noncopyable { + class Task { + WTF_MAKE_NONCOPYABLE(Task); public: virtual ~Task() { } virtual void performTask() = 0; diff --git a/Source/WebCore/fileapi/LocalFileSystem.h b/Source/WebCore/fileapi/LocalFileSystem.h index b779a5f..12a7012 100644 --- a/Source/WebCore/fileapi/LocalFileSystem.h +++ b/Source/WebCore/fileapi/LocalFileSystem.h @@ -45,7 +45,8 @@ class FileSystemCallback; class ScriptExecutionContext; // Keeps per-process information and provides an entry point to open a file system. -class LocalFileSystem : public Noncopyable { +class LocalFileSystem { + WTF_MAKE_NONCOPYABLE(LocalFileSystem); public: // Returns a per-process instance of LocalFileSystem. // Note that LocalFileSystem::initializeLocalFileSystem must be called before diff --git a/Source/WebCore/fileapi/SyncCallbackHelper.h b/Source/WebCore/fileapi/SyncCallbackHelper.h index 25e6739..020ac49 100644 --- a/Source/WebCore/fileapi/SyncCallbackHelper.h +++ b/Source/WebCore/fileapi/SyncCallbackHelper.h @@ -58,7 +58,8 @@ class FileEntrySync; // A helper template for FileSystemSync implementation. template <typename SuccessCallback, typename ObserverType, typename CallbackArg, typename ResultType> -class SyncCallbackHelper : public Noncopyable { +class SyncCallbackHelper { + WTF_MAKE_NONCOPYABLE(SyncCallbackHelper); public: typedef SyncCallbackHelper<SuccessCallback, ObserverType, CallbackArg, ResultType> HelperType; SyncCallbackHelper(ObserverType* observer = 0) |