Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / webdatabase / SQLStatement.h

diff --git a/src/third_party/WebKit/Source/modules/webdatabase/SQLStatement.h b/src/third_party/WebKit/Source/modules/webdatabase/SQLStatement.h
index 7ddc395..e31a16b 100644 (file)
--- a/src/third_party/WebKit/Source/modules/webdatabase/SQLStatement.h
+++ b/src/third_party/WebKit/Source/modules/webdatabase/SQLStatement.h
@@ -29,44 +29,43 @@
 #define SQLStatement_h
 
 #include "modules/webdatabase/sqlite/SQLValue.h"
-#include "modules/webdatabase/AbstractSQLStatement.h"
-#include "modules/webdatabase/SQLCallbackWrapper.h"
 #include "modules/webdatabase/SQLResultSet.h"
 #include "wtf/Forward.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class AbstractSQLStatementBackend;
 class Database;
 class SQLError;
+class SQLStatementBackend;
 class SQLStatementCallback;
 class SQLStatementErrorCallback;
 class SQLTransaction;
 
-class SQLStatement FINAL : public AbstractSQLStatement {
+class SQLStatement FINAL : public NoBaseWillBeGarbageCollectedFinalized<SQLStatement> {
 public:
     static PassOwnPtrWillBeRawPtr<SQLStatement> create(Database*,
-        PassOwnPtr<SQLStatementCallback>, PassOwnPtr<SQLStatementErrorCallback>);
-    virtual void trace(Visitor*) OVERRIDE;
+        SQLStatementCallback*, SQLStatementErrorCallback*);
+    ~SQLStatement();
+    void trace(Visitor*);
 
     bool performCallback(SQLTransaction*);
 
-    virtual void setBackend(AbstractSQLStatementBackend*) OVERRIDE;
+    void setBackend(SQLStatementBackend*);
 
-    virtual bool hasCallback() OVERRIDE;
-    virtual bool hasErrorCallback() OVERRIDE;
+    bool hasCallback();
+    bool hasErrorCallback();
 
 private:
-    SQLStatement(Database*, PassOwnPtr<SQLStatementCallback>, PassOwnPtr<SQLStatementErrorCallback>);
+    SQLStatement(Database*, SQLStatementCallback*, SQLStatementErrorCallback*);
 
-    // The AbstractSQLStatementBackend owns the SQLStatement. Hence, the backend is
+    // The SQLStatementBackend owns the SQLStatement. Hence, the backend is
     // guaranteed to be outlive the SQLStatement, and it is safe for us to refer
     // to the backend using a raw pointer here.
-    RawPtrWillBeMember<AbstractSQLStatementBackend> m_backend;
+    RawPtrWillBeMember<SQLStatementBackend> m_backend;
 
-    SQLCallbackWrapper<SQLStatementCallback> m_statementCallbackWrapper;
-    SQLCallbackWrapper<SQLStatementErrorCallback> m_statementErrorCallbackWrapper;
+    CrossThreadPersistentWillBeMember<SQLStatementCallback> m_statementCallback;
+    CrossThreadPersistentWillBeMember<SQLStatementErrorCallback> m_statementErrorCallback;
 };
 
 } // namespace blink