Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / indexeddb / IDBTransaction.h

diff --git a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
index 74b932f..6df3195 100644 (file)
--- a/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
+++ b/src/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.h
@@ -43,13 +43,12 @@ namespace blink {
 
 class DOMError;
 class ExceptionState;
-class IDBCursor;
 class IDBDatabase;
 class IDBObjectStore;
 class IDBOpenDBRequest;
 struct IDBObjectStoreMetadata;
 
-class IDBTransaction FINAL
+class IDBTransaction final
     : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<IDBTransaction>
     , public EventTargetWithInlineData
     , public ActiveDOMObject {
@@ -60,7 +59,7 @@ public:
     static IDBTransaction* create(ScriptState*, int64_t, const Vector<String>& objectStoreNames, WebIDBTransactionMode, IDBDatabase*);
     static IDBTransaction* create(ScriptState*, int64_t, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata& previousMetadata);
     virtual ~IDBTransaction();
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
     static WebIDBTransactionMode stringToMode(const String&, ExceptionState&);
 
@@ -77,7 +76,7 @@ public:
     // Implement the IDBTransaction IDL
     const String& mode() const;
     IDBDatabase* db() const { return m_database.get(); }
-    PassRefPtrWillBeRawPtr<DOMError> error() const { return m_error; }
+    DOMError* error() const { return m_error; }
     IDBObjectStore* objectStore(const String& name, ExceptionState&);
     void abort(ExceptionState&);
 
@@ -86,25 +85,25 @@ public:
     void objectStoreCreated(const String&, IDBObjectStore*);
     void objectStoreDeleted(const String&);
     void setActive(bool);
-    void setError(PassRefPtrWillBeRawPtr<DOMError>);
+    void setError(DOMError*);
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(abort);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(complete);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
 
-    void onAbort(PassRefPtrWillBeRawPtr<DOMError>);
+    void onAbort(DOMError*);
     void onComplete();
 
     // EventTarget
-    virtual const AtomicString& interfaceName() const OVERRIDE;
-    virtual ExecutionContext* executionContext() const OVERRIDE;
+    virtual const AtomicString& interfaceName() const override;
+    virtual ExecutionContext* executionContext() const override;
 
     using EventTarget::dispatchEvent;
-    virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE;
+    virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) override;
 
     // ActiveDOMObject
-    virtual bool hasPendingActivity() const OVERRIDE;
-    virtual void stop() OVERRIDE;
+    virtual bool hasPendingActivity() const override;
+    virtual void stop() override;
 
 private:
     IDBTransaction(ScriptState*, int64_t, const Vector<String>&, WebIDBTransactionMode, IDBDatabase*, IDBOpenDBRequest*, const IDBDatabaseMetadata&);
@@ -126,7 +125,7 @@ private:
     State m_state;
     bool m_hasPendingActivity;
     bool m_contextStopped;
-    RefPtrWillBeMember<DOMError> m_error;
+    Member<DOMError> m_error;
 
     HeapListHashSet<Member<IDBRequest> > m_requestList;