Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / fileapi / FileReader.h

diff --git a/src/third_party/WebKit/Source/core/fileapi/FileReader.h b/src/third_party/WebKit/Source/core/fileapi/FileReader.h
index cfe40a1..4da0006 100644 (file)
--- a/src/third_party/WebKit/Source/core/fileapi/FileReader.h
+++ b/src/third_party/WebKit/Source/core/fileapi/FileReader.h
@@ -47,12 +47,12 @@ class Blob;
 class ExceptionState;
 class ExecutionContext;
 
-class FileReader FINAL : public RefCountedWillBeGarbageCollectedFinalized<FileReader>, public ActiveDOMObject, public FileReaderLoaderClient, public EventTargetWithInlineData {
+class FileReader final : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<FileReader>, public ActiveDOMObject, public FileReaderLoaderClient, public EventTargetWithInlineData {
     DEFINE_WRAPPERTYPEINFO();
-    REFCOUNTED_EVENT_TARGET(FileReader);
+    DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<FileReader>);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FileReader);
 public:
-    static PassRefPtrWillBeRawPtr<FileReader> create(ExecutionContext*);
+    static FileReader* create(ExecutionContext*);
 
     virtual ~FileReader();
 
@@ -72,24 +72,24 @@ public:
     void doAbort();
 
     ReadyState readyState() const { return m_state; }
-    PassRefPtrWillBeRawPtr<FileError> error() { return m_error; }
+    FileError* error() { return m_error; }
     FileReaderLoader::ReadType readType() const { return m_readType; }
     PassRefPtr<ArrayBuffer> arrayBufferResult() const;
     String stringResult();
 
     // ActiveDOMObject
-    virtual void stop() OVERRIDE;
-    virtual bool hasPendingActivity() const OVERRIDE;
+    virtual void stop() override;
+    virtual bool hasPendingActivity() const override;
 
     // EventTarget
-    virtual const AtomicString& interfaceName() const OVERRIDE;
-    virtual ExecutionContext* executionContext() const OVERRIDE { return ActiveDOMObject::executionContext(); }
+    virtual const AtomicString& interfaceName() const override;
+    virtual ExecutionContext* executionContext() const override { return ActiveDOMObject::executionContext(); }
 
     // FileReaderLoaderClient
-    virtual void didStartLoading() OVERRIDE;
-    virtual void didReceiveData() OVERRIDE;
-    virtual void didFinishLoading() OVERRIDE;
-    virtual void didFail(FileError::ErrorCode) OVERRIDE;
+    virtual void didStartLoading() override;
+    virtual void didReceiveData() override;
+    virtual void didFinishLoading() override;
+    virtual void didFail(FileError::ErrorCode) override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadstart);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(progress);
@@ -98,7 +98,7 @@ public:
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadend);
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 private:
     explicit FileReader(ExecutionContext*);
@@ -129,7 +129,7 @@ private:
     String m_encoding;
 
     OwnPtr<FileReaderLoader> m_loader;
-    RefPtrWillBeMember<FileError> m_error;
+    Member<FileError> m_error;
     double m_lastProgressNotificationTimeMS;
     int m_asyncOperationId;
 };