Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / filesystem / InspectorFileSystemAgent.cpp

diff --git a/src/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp b/src/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
index df9f4c1..2c339e9 100644 (file)
--- a/src/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
+++ b/src/third_party/WebKit/Source/modules/filesystem/InspectorFileSystemAgent.cpp
@@ -81,7 +81,7 @@ static const char fileSystemAgentEnabled[] = "fileSystemAgentEnabled";
 namespace {
 
 template<typename BaseCallback, typename Handler, typename Argument>
-class CallbackDispatcher FINAL : public BaseCallback {
+class CallbackDispatcher final : public BaseCallback {
 public:
     typedef bool (Handler::*HandlingMethod)(Argument);
 
@@ -90,7 +90,7 @@ public:
         return new CallbackDispatcher(handler, handlingMethod);
     }
 
-    virtual void handleEvent(Argument argument) OVERRIDE
+    virtual void handleEvent(Argument argument) override
     {
         (m_handler.get()->*m_handlingMethod)(argument);
     }
@@ -154,13 +154,13 @@ void FileSystemRootRequest::start(ExecutionContext* executionContext)
 
     FileSystemType type;
     if (!DOMFileSystemBase::pathPrefixToFileSystemType(m_type, type)) {
-        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR).get());
+        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR));
         return;
     }
 
     KURL rootURL = DOMFileSystemBase::createFileSystemRootURL(executionContext->securityOrigin()->toString(), type);
     if (!rootURL.isValid()) {
-        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR).get());
+        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR));
         return;
     }
 
@@ -179,7 +179,7 @@ bool FileSystemRootRequest::didGetEntry(Entry* entry)
     return true;
 }
 
-class DirectoryContentRequest FINAL : public RefCounted<DirectoryContentRequest> {
+class DirectoryContentRequest final : public RefCounted<DirectoryContentRequest> {
     WTF_MAKE_NONCOPYABLE(DirectoryContentRequest);
 public:
     static PassRefPtr<DirectoryContentRequest> create(PassRefPtrWillBeRawPtr<RequestDirectoryContentCallback> requestCallback, const String& url)
@@ -300,7 +300,7 @@ bool DirectoryContentRequest::didReadDirectoryEntries(const EntryHeapVector& ent
     return true;
 }
 
-class MetadataRequest FINAL : public RefCounted<MetadataRequest> {
+class MetadataRequest final : public RefCounted<MetadataRequest> {
     WTF_MAKE_NONCOPYABLE(MetadataRequest);
 public:
     static PassRefPtr<MetadataRequest> create(PassRefPtrWillBeRawPtr<RequestMetadataCallback> requestCallback, const String& url)
@@ -373,7 +373,7 @@ bool MetadataRequest::didGetMetadata(Metadata* metadata)
     return true;
 }
 
-class FileContentRequest FINAL : public EventListener {
+class FileContentRequest final : public EventListener {
     WTF_MAKE_NONCOPYABLE(FileContentRequest);
 public:
     static PassRefPtr<FileContentRequest> create(PassRefPtrWillBeRawPtr<RequestFileContentCallback> requestCallback, const String& url, bool readAsText, long long start, long long end, const String& charset)
@@ -388,17 +388,17 @@ public:
 
     void start(ExecutionContext*);
 
-    virtual bool operator==(const EventListener& other) OVERRIDE
+    virtual bool operator==(const EventListener& other) override
     {
         return this == &other;
     }
 
-    virtual void handleEvent(ExecutionContext*, Event* event) OVERRIDE
+    virtual void handleEvent(ExecutionContext*, Event* event) override
     {
         if (event->type() == EventTypeNames::load)
             didRead();
         else if (event->type() == EventTypeNames::error)
-            didHitError(m_reader->error().get());
+            didHitError(m_reader->error());
     }
 
 private:
@@ -434,7 +434,7 @@ private:
     String m_mimeType;
     String m_charset;
 
-    RefPtrWillBePersistent<FileReader> m_reader;
+    Persistent<FileReader> m_reader;
 };
 
 void FileContentRequest::start(ExecutionContext* executionContext)
@@ -472,11 +472,11 @@ bool FileContentRequest::didGetEntry(Entry* entry)
 
 bool FileContentRequest::didGetFile(File* file)
 {
-    RefPtrWillBeRawPtr<Blob> blob = static_cast<Blob*>(file)->slice(m_start, m_end, IGNORE_EXCEPTION);
+    Blob* blob = file->Blob::slice(m_start, m_end, IGNORE_EXCEPTION);
     m_reader->setOnload(this);
     m_reader->setOnerror(this);
 
-    m_reader->readAsArrayBuffer(blob.get(), IGNORE_EXCEPTION);
+    m_reader->readAsArrayBuffer(blob, IGNORE_EXCEPTION);
     return true;
 }
 
@@ -497,7 +497,7 @@ void FileContentRequest::didRead()
     reportResult(static_cast<FileError::ErrorCode>(0), &result, &m_charset);
 }
 
-class DeleteEntryRequest FINAL : public RefCounted<DeleteEntryRequest> {
+class DeleteEntryRequest final : public RefCounted<DeleteEntryRequest> {
 public:
     static PassRefPtr<DeleteEntryRequest> create(PassRefPtrWillBeRawPtr<DeleteEntryCallback> requestCallback, const KURL& url)
     {
@@ -513,14 +513,14 @@ public:
 
 private:
     // CallbackDispatcherFactory doesn't handle 0-arg handleEvent methods
-    class VoidCallbackImpl FINAL : public VoidCallback {
+    class VoidCallbackImpl final : public VoidCallback {
     public:
         explicit VoidCallbackImpl(PassRefPtr<DeleteEntryRequest> handler)
             : m_handler(handler)
         {
         }
 
-        virtual void handleEvent() OVERRIDE
+        virtual void handleEvent() override
         {
             m_handler->didDeleteEntry();
         }
@@ -560,7 +560,7 @@ void DeleteEntryRequest::start(ExecutionContext* executionContext)
     FileSystemType type;
     String path;
     if (!DOMFileSystemBase::crackFileSystemURL(m_url, type, path)) {
-        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR).get());
+        errorCallback->handleEvent(FileError::create(FileError::SYNTAX_ERR));
         return;
     }