Commit 8d7d3c73 authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Remove Create() methods which use MakeGarbageCollected<> in modules/webdatabase

As advised in [1], this CL removes unnecessary Foo::Create() factory functions
which return an instance created by MakeGarbageCollected<Foo> in
//third_party/blink/renderer/modules/webdatabase, then this CL makes
the callers use MakeGarbageCollected<Foo> instead of Foo::Create() factory
functions.

[1] https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/iJ1bawbxbWs/vEdfT5QtBgAJ

Bug: 939691
Change-Id: Ic675c3325b66468b4686f69e0f950cc8d99034b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1556964Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#648656}
parent 1bc6d0a5
...@@ -234,7 +234,7 @@ void ModulesInitializer::InitInspectorAgentSession( ...@@ -234,7 +234,7 @@ void ModulesInitializer::InitInspectorAgentSession(
session->Append(MakeGarbageCollected<InspectorAccessibilityAgent>( session->Append(MakeGarbageCollected<InspectorAccessibilityAgent>(
inspected_frames, dom_agent)); inspected_frames, dom_agent));
if (allow_view_agents) { if (allow_view_agents) {
session->Append(InspectorDatabaseAgent::Create(page)); session->Append(MakeGarbageCollected<InspectorDatabaseAgent>(page));
session->Append( session->Append(
MakeGarbageCollected<InspectorCacheStorageAgent>(inspected_frames)); MakeGarbageCollected<InspectorCacheStorageAgent>(inspected_frames));
} }
......
...@@ -39,11 +39,6 @@ class SQLErrorData; ...@@ -39,11 +39,6 @@ class SQLErrorData;
class ChangeVersionWrapper final : public SQLTransactionWrapper { class ChangeVersionWrapper final : public SQLTransactionWrapper {
public: public:
static ChangeVersionWrapper* Create(const String& old_version,
const String& new_version) {
return MakeGarbageCollected<ChangeVersionWrapper>(old_version, new_version);
}
ChangeVersionWrapper(const String& old_version, const String& new_version); ChangeVersionWrapper(const String& old_version, const String& new_version);
bool PerformPreflight(SQLTransactionBackend*) override; bool PerformPreflight(SQLTransactionBackend*) override;
......
...@@ -346,12 +346,13 @@ SQLTransactionBackend* Database::RunTransaction(SQLTransaction* transaction, ...@@ -346,12 +346,13 @@ SQLTransactionBackend* Database::RunTransaction(SQLTransaction* transaction,
return nullptr; return nullptr;
SQLTransactionWrapper* wrapper = nullptr; SQLTransactionWrapper* wrapper = nullptr;
if (data) if (data) {
wrapper = wrapper = MakeGarbageCollected<ChangeVersionWrapper>(data->OldVersion(),
ChangeVersionWrapper::Create(data->OldVersion(), data->NewVersion()); data->NewVersion());
}
SQLTransactionBackend* transaction_backend = auto* transaction_backend = MakeGarbageCollected<SQLTransactionBackend>(
SQLTransactionBackend::Create(this, transaction, wrapper, read_only); this, transaction, wrapper, read_only);
transaction_queue_.push_back(transaction_backend); transaction_queue_.push_back(transaction_backend);
if (!transaction_in_progress_) if (!transaction_in_progress_)
ScheduleTransaction(); ScheduleTransaction();
...@@ -806,7 +807,7 @@ void Database::PerformTransaction( ...@@ -806,7 +807,7 @@ void Database::PerformTransaction(
static void CallTransactionErrorCallback( static void CallTransactionErrorCallback(
SQLTransaction::OnErrorCallback* callback, SQLTransaction::OnErrorCallback* callback,
std::unique_ptr<SQLErrorData> error_data) { std::unique_ptr<SQLErrorData> error_data) {
callback->OnError(SQLError::Create(*error_data)); callback->OnError(MakeGarbageCollected<SQLError>(*error_data));
} }
void Database::RunTransaction( void Database::RunTransaction(
......
...@@ -145,7 +145,7 @@ DatabaseThread* DatabaseContext::GetDatabaseThread() { ...@@ -145,7 +145,7 @@ DatabaseThread* DatabaseContext::GetDatabaseThread() {
// Create the database thread on first request - but not if at least one // Create the database thread on first request - but not if at least one
// database was already opened, because in that case we already had a // database was already opened, because in that case we already had a
// database thread and terminated it and should not create another. // database thread and terminated it and should not create another.
database_thread_ = DatabaseThread::Create(); database_thread_ = MakeGarbageCollected<DatabaseThread>();
database_thread_->Start(); database_thread_->Start();
} }
......
...@@ -44,10 +44,6 @@ class SQLTransactionCoordinator; ...@@ -44,10 +44,6 @@ class SQLTransactionCoordinator;
class DatabaseThread : public GarbageCollectedFinalized<DatabaseThread> { class DatabaseThread : public GarbageCollectedFinalized<DatabaseThread> {
public: public:
static DatabaseThread* Create() {
return MakeGarbageCollected<DatabaseThread>();
}
DatabaseThread(); DatabaseThread();
~DatabaseThread(); ~DatabaseThread();
void Trace(blink::Visitor*); void Trace(blink::Visitor*);
......
...@@ -82,11 +82,6 @@ class ExecuteSQLCallbackWrapper : public RefCounted<ExecuteSQLCallbackWrapper> { ...@@ -82,11 +82,6 @@ class ExecuteSQLCallbackWrapper : public RefCounted<ExecuteSQLCallbackWrapper> {
class StatementCallback final : public SQLStatement::OnSuccessCallback { class StatementCallback final : public SQLStatement::OnSuccessCallback {
public: public:
static StatementCallback* Create(
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) {
return MakeGarbageCollected<StatementCallback>(std::move(request_callback));
}
explicit StatementCallback( explicit StatementCallback(
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) scoped_refptr<ExecuteSQLCallbackWrapper> request_callback)
: request_callback_(std::move(request_callback)) {} : request_callback_(std::move(request_callback)) {}
...@@ -130,12 +125,6 @@ class StatementCallback final : public SQLStatement::OnSuccessCallback { ...@@ -130,12 +125,6 @@ class StatementCallback final : public SQLStatement::OnSuccessCallback {
class StatementErrorCallback final : public SQLStatement::OnErrorCallback { class StatementErrorCallback final : public SQLStatement::OnErrorCallback {
public: public:
static StatementErrorCallback* Create(
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) {
return MakeGarbageCollected<StatementErrorCallback>(
std::move(request_callback));
}
explicit StatementErrorCallback( explicit StatementErrorCallback(
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) scoped_refptr<ExecuteSQLCallbackWrapper> request_callback)
: request_callback_(std::move(request_callback)) {} : request_callback_(std::move(request_callback)) {}
...@@ -152,13 +141,6 @@ class StatementErrorCallback final : public SQLStatement::OnErrorCallback { ...@@ -152,13 +141,6 @@ class StatementErrorCallback final : public SQLStatement::OnErrorCallback {
class TransactionCallback final : public SQLTransaction::OnProcessCallback { class TransactionCallback final : public SQLTransaction::OnProcessCallback {
public: public:
static TransactionCallback* Create(
const String& sql_statement,
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) {
return MakeGarbageCollected<TransactionCallback>(
sql_statement, std::move(request_callback));
}
explicit TransactionCallback( explicit TransactionCallback(
const String& sql_statement, const String& sql_statement,
scoped_refptr<ExecuteSQLCallbackWrapper> request_callback) scoped_refptr<ExecuteSQLCallbackWrapper> request_callback)
...@@ -168,10 +150,11 @@ class TransactionCallback final : public SQLTransaction::OnProcessCallback { ...@@ -168,10 +150,11 @@ class TransactionCallback final : public SQLTransaction::OnProcessCallback {
bool OnProcess(SQLTransaction* transaction) override { bool OnProcess(SQLTransaction* transaction) override {
Vector<SQLValue> sql_values; Vector<SQLValue> sql_values;
transaction->ExecuteSQL(sql_statement_, sql_values, transaction->ExecuteSQL(
StatementCallback::Create(request_callback_), sql_statement_, sql_values,
StatementErrorCallback::Create(request_callback_), MakeGarbageCollected<StatementCallback>(request_callback_),
IGNORE_EXCEPTION_FOR_TESTING); MakeGarbageCollected<StatementErrorCallback>(request_callback_),
IGNORE_EXCEPTION_FOR_TESTING);
return true; return true;
} }
...@@ -220,8 +203,8 @@ void InspectorDatabaseAgent::DidOpenDatabase(blink::Database* database, ...@@ -220,8 +203,8 @@ void InspectorDatabaseAgent::DidOpenDatabase(blink::Database* database,
return; return;
} }
InspectorDatabaseResource* resource = auto* resource = MakeGarbageCollected<InspectorDatabaseResource>(
InspectorDatabaseResource::Create(database, domain, name, version); database, domain, name, version);
resources_.Set(resource->Id(), resource); resources_.Set(resource->Id(), resource);
// Resources are only bound while visible. // Resources are only bound while visible.
DCHECK(enabled_.Get()); DCHECK(enabled_.Get());
...@@ -313,7 +296,7 @@ void InspectorDatabaseAgent::executeSQL( ...@@ -313,7 +296,7 @@ void InspectorDatabaseAgent::executeSQL(
scoped_refptr<ExecuteSQLCallbackWrapper> wrapper = scoped_refptr<ExecuteSQLCallbackWrapper> wrapper =
ExecuteSQLCallbackWrapper::Create(std::move(request_callback)); ExecuteSQLCallbackWrapper::Create(std::move(request_callback));
TransactionCallback* callback = TransactionCallback::Create(query, wrapper); auto* callback = MakeGarbageCollected<TransactionCallback>(query, wrapper);
TransactionErrorCallback* error_callback = TransactionErrorCallback* error_callback =
TransactionErrorCallback::Create(wrapper); TransactionErrorCallback::Create(wrapper);
SQLTransaction::OnSuccessCallback* success_callback = nullptr; SQLTransaction::OnSuccessCallback* success_callback = nullptr;
......
...@@ -46,10 +46,6 @@ class Page; ...@@ -46,10 +46,6 @@ class Page;
class MODULES_EXPORT InspectorDatabaseAgent final class MODULES_EXPORT InspectorDatabaseAgent final
: public InspectorBaseAgent<protocol::Database::Metainfo> { : public InspectorBaseAgent<protocol::Database::Metainfo> {
public: public:
static InspectorDatabaseAgent* Create(Page* page) {
return MakeGarbageCollected<InspectorDatabaseAgent>(page);
}
explicit InspectorDatabaseAgent(Page*); explicit InspectorDatabaseAgent(Page*);
~InspectorDatabaseAgent() override; ~InspectorDatabaseAgent() override;
void Trace(blink::Visitor*) override; void Trace(blink::Visitor*) override;
......
...@@ -36,15 +36,6 @@ namespace blink { ...@@ -36,15 +36,6 @@ namespace blink {
static int g_next_unused_id = 1; static int g_next_unused_id = 1;
InspectorDatabaseResource* InspectorDatabaseResource::Create(
Database* database,
const String& domain,
const String& name,
const String& version) {
return MakeGarbageCollected<InspectorDatabaseResource>(database, domain, name,
version);
}
InspectorDatabaseResource::InspectorDatabaseResource(Database* database, InspectorDatabaseResource::InspectorDatabaseResource(Database* database,
const String& domain, const String& domain,
const String& name, const String& name,
......
...@@ -42,10 +42,6 @@ class Database; ...@@ -42,10 +42,6 @@ class Database;
class InspectorDatabaseResource class InspectorDatabaseResource
: public GarbageCollectedFinalized<InspectorDatabaseResource> { : public GarbageCollectedFinalized<InspectorDatabaseResource> {
public: public:
static InspectorDatabaseResource* Create(Database*,
const String& domain,
const String& name,
const String& version);
InspectorDatabaseResource(Database*, InspectorDatabaseResource(Database*,
const String& domain, const String& domain,
const String& name, const String& name,
......
...@@ -68,10 +68,6 @@ class SQLError final : public ScriptWrappable { ...@@ -68,10 +68,6 @@ class SQLError final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static SQLError* Create(const SQLErrorData& data) {
return MakeGarbageCollected<SQLError>(data);
}
explicit SQLError(const SQLErrorData& data) : data_(data) {} explicit SQLError(const SQLErrorData& data) : data_(data) {}
unsigned code() const { return data_.Code(); } unsigned code() const { return data_.Code(); }
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
namespace blink { namespace blink {
SQLResultSet::SQLResultSet() SQLResultSet::SQLResultSet()
: rows_(SQLResultSetRowList::Create()), : rows_(MakeGarbageCollected<SQLResultSetRowList>()),
insert_id_(0), insert_id_(0),
rows_affected_(0), rows_affected_(0),
insert_id_set_(false), insert_id_set_(false),
......
...@@ -41,8 +41,6 @@ class SQLResultSet final : public ScriptWrappable { ...@@ -41,8 +41,6 @@ class SQLResultSet final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static SQLResultSet* Create() { return MakeGarbageCollected<SQLResultSet>(); }
SQLResultSet(); SQLResultSet();
void Trace(blink::Visitor*) override; void Trace(blink::Visitor*) override;
......
...@@ -43,10 +43,6 @@ class SQLResultSetRowList final : public ScriptWrappable { ...@@ -43,10 +43,6 @@ class SQLResultSetRowList final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static SQLResultSetRowList* Create() {
return MakeGarbageCollected<SQLResultSetRowList>();
}
SQLResultSetRowList() = default; SQLResultSetRowList() = default;
const Vector<String>& ColumnNames() const { return columns_; } const Vector<String>& ColumnNames() const { return columns_; }
......
...@@ -83,12 +83,6 @@ bool SQLStatement::OnErrorV8Impl::OnError(SQLTransaction* transaction, ...@@ -83,12 +83,6 @@ bool SQLStatement::OnErrorV8Impl::OnError(SQLTransaction* transaction,
return return_value; return return_value;
} }
SQLStatement* SQLStatement::Create(Database* database,
OnSuccessCallback* callback,
OnErrorCallback* error_callback) {
return MakeGarbageCollected<SQLStatement>(database, callback, error_callback);
}
SQLStatement::SQLStatement(Database* database, SQLStatement::SQLStatement(Database* database,
OnSuccessCallback* callback, OnSuccessCallback* callback,
OnErrorCallback* error_callback) OnErrorCallback* error_callback)
...@@ -136,8 +130,8 @@ bool SQLStatement::PerformCallback(SQLTransaction* transaction) { ...@@ -136,8 +130,8 @@ bool SQLStatement::PerformCallback(SQLTransaction* transaction) {
// error, because then we need to jump to the transaction error callback. // error, because then we need to jump to the transaction error callback.
if (error) { if (error) {
if (error_callback) { if (error_callback) {
callback_error = callback_error = error_callback->OnError(
error_callback->OnError(transaction, SQLError::Create(*error)); transaction, MakeGarbageCollected<SQLError>(*error));
} }
} else if (callback) { } else if (callback) {
callback_error = callback_error =
......
...@@ -82,15 +82,6 @@ ...@@ -82,15 +82,6 @@
namespace blink { namespace blink {
SQLStatementBackend* SQLStatementBackend::Create(
SQLStatement* frontend,
const String& statement,
const Vector<SQLValue>& arguments,
int permissions) {
return MakeGarbageCollected<SQLStatementBackend>(frontend, statement,
arguments, permissions);
}
SQLStatementBackend::SQLStatementBackend(SQLStatement* frontend, SQLStatementBackend::SQLStatementBackend(SQLStatement* frontend,
const String& statement, const String& statement,
const Vector<SQLValue>& arguments, const Vector<SQLValue>& arguments,
...@@ -100,7 +91,7 @@ SQLStatementBackend::SQLStatementBackend(SQLStatement* frontend, ...@@ -100,7 +91,7 @@ SQLStatementBackend::SQLStatementBackend(SQLStatement* frontend,
arguments_(arguments), arguments_(arguments),
has_callback_(frontend_->HasCallback()), has_callback_(frontend_->HasCallback()),
has_error_callback_(frontend_->HasErrorCallback()), has_error_callback_(frontend_->HasErrorCallback()),
result_set_(SQLResultSet::Create()), result_set_(MakeGarbageCollected<SQLResultSet>()),
permissions_(permissions) { permissions_(permissions) {
DCHECK(IsMainThread()); DCHECK(IsMainThread());
......
...@@ -45,11 +45,6 @@ class SQLStatement; ...@@ -45,11 +45,6 @@ class SQLStatement;
class SQLStatementBackend final class SQLStatementBackend final
: public GarbageCollectedFinalized<SQLStatementBackend> { : public GarbageCollectedFinalized<SQLStatementBackend> {
public: public:
static SQLStatementBackend* Create(SQLStatement*,
const String& sql_statement,
const Vector<SQLValue>& arguments,
int permissions);
SQLStatementBackend(SQLStatement*, SQLStatementBackend(SQLStatement*,
const String& statement, const String& statement,
const Vector<SQLValue>& arguments, const Vector<SQLValue>& arguments,
......
...@@ -223,7 +223,8 @@ SQLTransactionState SQLTransaction::DeliverTransactionErrorCallback() { ...@@ -223,7 +223,8 @@ SQLTransactionState SQLTransaction::DeliverTransactionErrorCallback() {
std::make_unique<SQLErrorData>(*backend_->TransactionError()); std::make_unique<SQLErrorData>(*backend_->TransactionError());
} }
DCHECK(transaction_error_); DCHECK(transaction_error_);
error_callback->OnError(SQLError::Create(*transaction_error_)); error_callback->OnError(
MakeGarbageCollected<SQLError>(*transaction_error_));
transaction_error_ = nullptr; transaction_error_ = nullptr;
} }
...@@ -328,8 +329,8 @@ void SQLTransaction::ExecuteSQL(const String& sql_statement, ...@@ -328,8 +329,8 @@ void SQLTransaction::ExecuteSQL(const String& sql_statement,
else if (read_only_) else if (read_only_)
permissions |= DatabaseAuthorizer::kReadOnlyMask; permissions |= DatabaseAuthorizer::kReadOnlyMask;
SQLStatement* statement = auto* statement = MakeGarbageCollected<SQLStatement>(
SQLStatement::Create(database_.Get(), callback, callback_error); database_.Get(), callback, callback_error);
backend_->ExecuteSQL(statement, sql_statement, arguments, permissions); backend_->ExecuteSQL(statement, sql_statement, arguments, permissions);
} }
......
...@@ -366,15 +366,6 @@ ...@@ -366,15 +366,6 @@
namespace blink { namespace blink {
SQLTransactionBackend* SQLTransactionBackend::Create(
Database* db,
SQLTransaction* frontend,
SQLTransactionWrapper* wrapper,
bool read_only) {
return MakeGarbageCollected<SQLTransactionBackend>(db, frontend, wrapper,
read_only);
}
SQLTransactionBackend::SQLTransactionBackend(Database* db, SQLTransactionBackend::SQLTransactionBackend(Database* db,
SQLTransaction* frontend, SQLTransaction* frontend,
SQLTransactionWrapper* wrapper, SQLTransactionWrapper* wrapper,
...@@ -563,8 +554,8 @@ void SQLTransactionBackend::ExecuteSQL(SQLStatement* statement, ...@@ -563,8 +554,8 @@ void SQLTransactionBackend::ExecuteSQL(SQLStatement* statement,
const Vector<SQLValue>& arguments, const Vector<SQLValue>& arguments,
int permissions) { int permissions) {
DCHECK(IsMainThread()); DCHECK(IsMainThread());
EnqueueStatementBackend(SQLStatementBackend::Create(statement, sql_statement, EnqueueStatementBackend(MakeGarbageCollected<SQLStatementBackend>(
arguments, permissions)); statement, sql_statement, arguments, permissions));
} }
void SQLTransactionBackend::NotifyDatabaseThreadIsShuttingDown() { void SQLTransactionBackend::NotifyDatabaseThreadIsShuttingDown() {
......
...@@ -62,11 +62,6 @@ class SQLTransactionBackend final ...@@ -62,11 +62,6 @@ class SQLTransactionBackend final
: public GarbageCollectedFinalized<SQLTransactionBackend>, : public GarbageCollectedFinalized<SQLTransactionBackend>,
public SQLTransactionStateMachine<SQLTransactionBackend> { public SQLTransactionStateMachine<SQLTransactionBackend> {
public: public:
static SQLTransactionBackend* Create(Database*,
SQLTransaction*,
SQLTransactionWrapper*,
bool read_only);
SQLTransactionBackend(Database*, SQLTransactionBackend(Database*,
SQLTransaction*, SQLTransaction*,
SQLTransactionWrapper*, SQLTransactionWrapper*,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment