Commit ad7086de authored by Gyuyoung Kim's avatar Gyuyoung Kim Committed by Commit Bot

Inline static Create() factory functions from renderer/modules

This CL removes unnecessary Create() factory functions in
//third_partyb/blink/renderer/modules only when it
meets the policy of removing Create() so that we support
only one of Create() methods or public constructors in a class.
Then, this CL makes all callers use MakeGarbageCollected<Foo>
instead.

This CL removes below Create() functions,
  - BackgroundFetchManager::Create
  - PeriodicSyncManager::Create
  - SyncManager::Create
  - IDBAny::CreateUndefined()
  - IDBAny::CreateNull()
  - PaymentManager::Create
  - WebGLVertexArrayObjectOES::Create
  - WebGLCompressedTextureASTC::Create
  - WebGLDrawInstancedBaseVertexBaseInstance::Create

Bug: 939691
Change-Id: Idf930e7ba073b110c90803e2ba509695480d12bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980527Reviewed-by: default avatarKai Ninomiya <kainino@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#727295}
parent 10a9e83f
...@@ -41,11 +41,6 @@ class MODULES_EXPORT BackgroundFetchManager final ...@@ -41,11 +41,6 @@ class MODULES_EXPORT BackgroundFetchManager final
explicit BackgroundFetchManager(ServiceWorkerRegistration* registration); explicit BackgroundFetchManager(ServiceWorkerRegistration* registration);
~BackgroundFetchManager() override = default; ~BackgroundFetchManager() override = default;
static BackgroundFetchManager* Create(
ServiceWorkerRegistration* registration) {
return MakeGarbageCollected<BackgroundFetchManager>(registration);
}
// Web Exposed methods defined in the IDL file. // Web Exposed methods defined in the IDL file.
ScriptPromise fetch( ScriptPromise fetch(
ScriptState* script_state, ScriptState* script_state,
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/modules/background_fetch/service_worker_registration_background_fetch.h" #include "third_party/blink/renderer/modules/background_fetch/service_worker_registration_background_fetch.h"
#include "third_party/blink/renderer/modules/background_fetch/background_fetch_manager.h" #include "third_party/blink/renderer/modules/background_fetch/background_fetch_manager.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
namespace blink { namespace blink {
...@@ -44,8 +45,10 @@ ServiceWorkerRegistrationBackgroundFetch::backgroundFetch( ...@@ -44,8 +45,10 @@ ServiceWorkerRegistrationBackgroundFetch::backgroundFetch(
BackgroundFetchManager* BackgroundFetchManager*
ServiceWorkerRegistrationBackgroundFetch::backgroundFetch() { ServiceWorkerRegistrationBackgroundFetch::backgroundFetch() {
if (!background_fetch_manager_) if (!background_fetch_manager_) {
background_fetch_manager_ = BackgroundFetchManager::Create(registration_); background_fetch_manager_ =
MakeGarbageCollected<BackgroundFetchManager>(registration_);
}
return background_fetch_manager_.Get(); return background_fetch_manager_.Get();
} }
......
...@@ -25,13 +25,6 @@ class PeriodicSyncManager final : public ScriptWrappable { ...@@ -25,13 +25,6 @@ class PeriodicSyncManager final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static PeriodicSyncManager* Create(
ServiceWorkerRegistration* registration,
scoped_refptr<base::SequencedTaskRunner> task_runner) {
return MakeGarbageCollected<PeriodicSyncManager>(registration,
std::move(task_runner));
}
PeriodicSyncManager(ServiceWorkerRegistration* registration, PeriodicSyncManager(ServiceWorkerRegistration* registration,
scoped_refptr<base::SequencedTaskRunner> task_runner); scoped_refptr<base::SequencedTaskRunner> task_runner);
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include "third_party/blink/renderer/modules/background_sync/periodic_sync_manager.h" #include "third_party/blink/renderer/modules/background_sync/periodic_sync_manager.h"
#include "third_party/blink/renderer/modules/background_sync/sync_manager.h" #include "third_party/blink/renderer/modules/background_sync/sync_manager.h"
#include "third_party/blink/renderer/modules/service_worker/service_worker_registration.h" #include "third_party/blink/renderer/modules/service_worker/service_worker_registration.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
namespace blink { namespace blink {
...@@ -41,7 +42,7 @@ SyncManager* ServiceWorkerRegistrationSync::sync() { ...@@ -41,7 +42,7 @@ SyncManager* ServiceWorkerRegistrationSync::sync() {
if (!sync_manager_) { if (!sync_manager_) {
ExecutionContext* execution_context = registration_->GetExecutionContext(); ExecutionContext* execution_context = registration_->GetExecutionContext();
// TODO(falken): Consider defining a task source in the spec for this event. // TODO(falken): Consider defining a task source in the spec for this event.
sync_manager_ = SyncManager::Create( sync_manager_ = MakeGarbageCollected<SyncManager>(
registration_, registration_,
execution_context->GetTaskRunner(TaskType::kMiscPlatformAPI)); execution_context->GetTaskRunner(TaskType::kMiscPlatformAPI));
} }
...@@ -57,7 +58,7 @@ PeriodicSyncManager* ServiceWorkerRegistrationSync::periodicSync() { ...@@ -57,7 +58,7 @@ PeriodicSyncManager* ServiceWorkerRegistrationSync::periodicSync() {
if (!periodic_sync_manager_) { if (!periodic_sync_manager_) {
ExecutionContext* execution_context = registration_->GetExecutionContext(); ExecutionContext* execution_context = registration_->GetExecutionContext();
// TODO(falken): Consider defining a task source in the spec for this event. // TODO(falken): Consider defining a task source in the spec for this event.
periodic_sync_manager_ = PeriodicSyncManager::Create( periodic_sync_manager_ = MakeGarbageCollected<PeriodicSyncManager>(
registration_, registration_,
execution_context->GetTaskRunner(TaskType::kMiscPlatformAPI)); execution_context->GetTaskRunner(TaskType::kMiscPlatformAPI));
} }
......
...@@ -23,13 +23,6 @@ class SyncManager final : public ScriptWrappable { ...@@ -23,13 +23,6 @@ class SyncManager final : public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static SyncManager* Create(
ServiceWorkerRegistration* registration,
scoped_refptr<base::SequencedTaskRunner> task_runner) {
return MakeGarbageCollected<SyncManager>(registration,
std::move(task_runner));
}
SyncManager(ServiceWorkerRegistration*, SyncManager(ServiceWorkerRegistration*,
scoped_refptr<base::SequencedTaskRunner>); scoped_refptr<base::SequencedTaskRunner>);
......
...@@ -35,14 +35,6 @@ ...@@ -35,14 +35,6 @@
namespace blink { namespace blink {
IDBAny* IDBAny::CreateUndefined() {
return MakeGarbageCollected<IDBAny>(kUndefinedType);
}
IDBAny* IDBAny::CreateNull() {
return MakeGarbageCollected<IDBAny>(kNullType);
}
IDBAny::IDBAny(Type type) : type_(type) { IDBAny::IDBAny(Type type) : type_(type) {
DCHECK(type == kUndefinedType || type == kNullType); DCHECK(type == kUndefinedType || type == kNullType);
} }
......
...@@ -55,9 +55,6 @@ class IDBObjectStore; ...@@ -55,9 +55,6 @@ class IDBObjectStore;
class MODULES_EXPORT IDBAny final : public GarbageCollected<IDBAny> { class MODULES_EXPORT IDBAny final : public GarbageCollected<IDBAny> {
public: public:
static IDBAny* CreateUndefined();
static IDBAny* CreateNull();
enum Type { enum Type {
kUndefinedType = 0, kUndefinedType = 0,
kNullType, kNullType,
......
...@@ -407,7 +407,7 @@ ScriptValue IDBCursor::value(ScriptState* script_state) { ...@@ -407,7 +407,7 @@ ScriptValue IDBCursor::value(ScriptState* script_state) {
#endif // DCHECK_IS_ON() #endif // DCHECK_IS_ON()
} else { } else {
value = IDBAny::CreateUndefined(); value = MakeGarbageCollected<IDBAny>(IDBAny::kUndefinedType);
} }
value_dirty_ = false; value_dirty_ = false;
......
...@@ -165,7 +165,7 @@ void IDBOpenDBRequest::EnqueueResponse(int64_t old_version) { ...@@ -165,7 +165,7 @@ void IDBOpenDBRequest::EnqueueResponse(int64_t old_version) {
// This database hasn't had an integer version before. // This database hasn't had an integer version before.
old_version = IDBDatabaseMetadata::kDefaultVersion; old_version = IDBDatabaseMetadata::kDefaultVersion;
} }
SetResult(IDBAny::CreateUndefined()); SetResult(MakeGarbageCollected<IDBAny>(IDBAny::kUndefinedType));
EnqueueEvent(MakeGarbageCollected<IDBVersionChangeEvent>( EnqueueEvent(MakeGarbageCollected<IDBVersionChangeEvent>(
event_type_names::kSuccess, old_version, base::nullopt)); event_type_names::kSuccess, old_version, base::nullopt));
} }
......
...@@ -413,7 +413,7 @@ void IDBRequest::EnqueueResponse(DOMException* error) { ...@@ -413,7 +413,7 @@ void IDBRequest::EnqueueResponse(DOMException* error) {
} }
error_ = error; error_ = error;
SetResult(IDBAny::CreateUndefined()); SetResult(MakeGarbageCollected<IDBAny>(IDBAny::kUndefinedType));
pending_cursor_.Clear(); pending_cursor_.Clear();
EnqueueEvent(Event::CreateCancelableBubble(event_type_names::kError)); EnqueueEvent(Event::CreateCancelableBubble(event_type_names::kError));
} }
...@@ -482,7 +482,7 @@ void IDBRequest::EnqueueResponse(std::unique_ptr<IDBKey> idb_key) { ...@@ -482,7 +482,7 @@ void IDBRequest::EnqueueResponse(std::unique_ptr<IDBKey> idb_key) {
if (idb_key && idb_key->IsValid()) if (idb_key && idb_key->IsValid())
EnqueueResultInternal(MakeGarbageCollected<IDBAny>(std::move(idb_key))); EnqueueResultInternal(MakeGarbageCollected<IDBAny>(std::move(idb_key)));
else else
EnqueueResultInternal(IDBAny::CreateUndefined()); EnqueueResultInternal(MakeGarbageCollected<IDBAny>(IDBAny::kUndefinedType));
} }
namespace { namespace {
...@@ -556,7 +556,7 @@ void IDBRequest::EnqueueResponse() { ...@@ -556,7 +556,7 @@ void IDBRequest::EnqueueResponse() {
metrics_.RecordAndReset(); metrics_.RecordAndReset();
return; return;
} }
EnqueueResultInternal(IDBAny::CreateUndefined()); EnqueueResultInternal(MakeGarbageCollected<IDBAny>(IDBAny::kUndefinedType));
} }
void IDBRequest::EnqueueResultInternal(IDBAny* result) { void IDBRequest::EnqueueResultInternal(IDBAny* result) {
......
...@@ -41,7 +41,7 @@ PaymentManager* PaymentAppServiceWorkerRegistration::paymentManager( ...@@ -41,7 +41,7 @@ PaymentManager* PaymentAppServiceWorkerRegistration::paymentManager(
PaymentManager* PaymentAppServiceWorkerRegistration::paymentManager( PaymentManager* PaymentAppServiceWorkerRegistration::paymentManager(
ScriptState* script_state) { ScriptState* script_state) {
if (!payment_manager_) { if (!payment_manager_) {
payment_manager_ = PaymentManager::Create(registration_); payment_manager_ = MakeGarbageCollected<PaymentManager>(registration_);
} }
return payment_manager_.Get(); return payment_manager_.Get();
} }
......
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
namespace blink { namespace blink {
PaymentManager* PaymentManager::Create(
ServiceWorkerRegistration* registration) {
return MakeGarbageCollected<PaymentManager>(registration);
}
PaymentInstruments* PaymentManager::instruments() { PaymentInstruments* PaymentManager::instruments() {
if (!instruments_) if (!instruments_)
instruments_ = MakeGarbageCollected<PaymentInstruments>(manager_); instruments_ = MakeGarbageCollected<PaymentInstruments>(manager_);
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h" #include "third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.h"
#include "third_party/blink/renderer/modules/webgl/webgl_vertex_array_object_oes.h" #include "third_party/blink/renderer/modules/webgl/webgl_vertex_array_object_oes.h"
#include "third_party/blink/renderer/platform/bindings/exception_state.h" #include "third_party/blink/renderer/platform/bindings/exception_state.h"
#include "third_party/blink/renderer/platform/heap/heap.h"
namespace blink { namespace blink {
...@@ -47,7 +48,7 @@ WebGLVertexArrayObjectOES* OESVertexArrayObject::createVertexArrayOES() { ...@@ -47,7 +48,7 @@ WebGLVertexArrayObjectOES* OESVertexArrayObject::createVertexArrayOES() {
if (scoped.IsLost()) if (scoped.IsLost())
return nullptr; return nullptr;
return WebGLVertexArrayObjectOES::Create( return MakeGarbageCollected<WebGLVertexArrayObjectOES>(
scoped.Context(), WebGLVertexArrayObjectOES::kVaoTypeUser); scoped.Context(), WebGLVertexArrayObjectOES::kVaoTypeUser);
} }
......
...@@ -52,11 +52,6 @@ WebGLExtensionName WebGLCompressedTextureASTC::GetName() const { ...@@ -52,11 +52,6 @@ WebGLExtensionName WebGLCompressedTextureASTC::GetName() const {
return kWebGLCompressedTextureASTCName; return kWebGLCompressedTextureASTCName;
} }
WebGLCompressedTextureASTC* WebGLCompressedTextureASTC::Create(
WebGLRenderingContextBase* context) {
return MakeGarbageCollected<WebGLCompressedTextureASTC>(context);
}
bool WebGLCompressedTextureASTC::Supported(WebGLRenderingContextBase* context) { bool WebGLCompressedTextureASTC::Supported(WebGLRenderingContextBase* context) {
Extensions3DUtil* extensions_util = context->ExtensionsUtil(); Extensions3DUtil* extensions_util = context->ExtensionsUtil();
return extensions_util->SupportsExtension( return extensions_util->SupportsExtension(
......
...@@ -19,7 +19,6 @@ class WebGLCompressedTextureASTC final : public WebGLExtension { ...@@ -19,7 +19,6 @@ class WebGLCompressedTextureASTC final : public WebGLExtension {
int block_height; int block_height;
} BlockSizeCompressASTC; } BlockSizeCompressASTC;
static WebGLCompressedTextureASTC* Create(WebGLRenderingContextBase*);
static bool Supported(WebGLRenderingContextBase*); static bool Supported(WebGLRenderingContextBase*);
static const char* ExtensionName(); static const char* ExtensionName();
......
...@@ -42,13 +42,6 @@ WebGLExtensionName WebGLDrawInstancedBaseVertexBaseInstance::GetName() const { ...@@ -42,13 +42,6 @@ WebGLExtensionName WebGLDrawInstancedBaseVertexBaseInstance::GetName() const {
return kWebGLDrawInstancedBaseVertexBaseInstanceName; return kWebGLDrawInstancedBaseVertexBaseInstanceName;
} }
WebGLDrawInstancedBaseVertexBaseInstance*
WebGLDrawInstancedBaseVertexBaseInstance::Create(
WebGLRenderingContextBase* context) {
return MakeGarbageCollected<WebGLDrawInstancedBaseVertexBaseInstance>(
context);
}
// static // static
bool WebGLDrawInstancedBaseVertexBaseInstance::Supported( bool WebGLDrawInstancedBaseVertexBaseInstance::Supported(
WebGLRenderingContextBase* context) { WebGLRenderingContextBase* context) {
......
...@@ -35,8 +35,6 @@ class WebGLDrawInstancedBaseVertexBaseInstance final : public WebGLExtension { ...@@ -35,8 +35,6 @@ class WebGLDrawInstancedBaseVertexBaseInstance final : public WebGLExtension {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static WebGLDrawInstancedBaseVertexBaseInstance* Create(
WebGLRenderingContextBase*);
static bool Supported(WebGLRenderingContextBase*); static bool Supported(WebGLRenderingContextBase*);
static const char* ExtensionName(); static const char* ExtensionName();
......
...@@ -29,12 +29,6 @@ ...@@ -29,12 +29,6 @@
namespace blink { namespace blink {
WebGLVertexArrayObjectOES* WebGLVertexArrayObjectOES::Create(
WebGLRenderingContextBase* ctx,
VaoType type) {
return MakeGarbageCollected<WebGLVertexArrayObjectOES>(ctx, type);
}
WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES( WebGLVertexArrayObjectOES::WebGLVertexArrayObjectOES(
WebGLRenderingContextBase* ctx, WebGLRenderingContextBase* ctx,
VaoType type) VaoType type)
......
...@@ -34,8 +34,6 @@ class WebGLVertexArrayObjectOES final : public WebGLVertexArrayObjectBase { ...@@ -34,8 +34,6 @@ class WebGLVertexArrayObjectOES final : public WebGLVertexArrayObjectBase {
DEFINE_WRAPPERTYPEINFO(); DEFINE_WRAPPERTYPEINFO();
public: public:
static WebGLVertexArrayObjectOES* Create(WebGLRenderingContextBase*, VaoType);
explicit WebGLVertexArrayObjectOES(WebGLRenderingContextBase*, VaoType); explicit WebGLVertexArrayObjectOES(WebGLRenderingContextBase*, VaoType);
}; };
......
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