Skip to content

GitLab

T
tangled
Commit 0fa0f1ee authored by yhirano@chromium.org's avatar yhirano@chromium.org
Browse files
Options

[ServiceWorker] Use appopriate type parameters for WebCallbacks (1/3) 

 - WebServiceWorkerRegistration* (ownership transferred)
  => WebPassOwnPtr<WebServiceWorkerRegistration>
 - WebVector<WebServiceWorkerRegistration*> (ownership transferred)
  => WebPassOwnPtr<WebVector<WebServiceWorkerRegistration*>>
 - WebServiceWorkerError* (ownership transferred)
  => const WebServiceWorkerError&

This CL also fixes a memory leak in GetRegistrationsCallback::onSuccess.

1/3: https://codereview.chromium.org/1312343004/
2/3: https://codereview.chromium.org/1318953002/
3/3: https://codereview.chromium.org/1316293002/

BUG=493531, 525340

Review URL: https://codereview.chromium.org/1312343004

git-svn-id: svn://svn.chromium.org/blink/trunk@201321 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0d554e5a
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 36 deletions
third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
View file @ 0fa0f1ee
......@@ -64,22 +64,18 @@ public:
: m_resolver(resolver) { }
~RegistrationCallback() override { }
// Takes ownership of |registrationRaw|.
void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
void onSuccess(WebPassOwnPtr<WebServiceWorkerRegistration> registration) override
{
OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
m_resolver->resolve(ServiceWorkerRegistration::create(m_resolver->executionContext(), registration.release()));
}
// Takes ownership of |errorRaw|.
void onError(WebServiceWorkerError* errorRaw) override
void onError(const WebServiceWorkerError& error) override
{
OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
}
private:
......@@ -93,10 +89,9 @@ public:
: m_resolver(resolver) { }
~GetRegistrationCallback() override { }
// Takes ownership of |registrationRaw|.
void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
void onSuccess(WebPassOwnPtr<WebServiceWorkerRegistration> r) override
{
OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
OwnPtr<WebServiceWorkerRegistration> registration = r.release();
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
if (!registration) {
......@@ -107,13 +102,11 @@ public:
m_resolver->resolve(ServiceWorkerRegistration::create(m_resolver->executionContext(), registration.release()));
}
// Takes ownership of |errorRaw|.
void onError(WebServiceWorkerError* errorRaw) override
void onError(const WebServiceWorkerError& error) override
{
OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
}
private:
......@@ -127,22 +120,24 @@ public:
: m_resolver(resolver) { }
~GetRegistrationsCallback() override { }
// Takes ownership of |registrationsRaw|.
void onSuccess(WebVector<WebServiceWorkerRegistration*>* registrationsRaw) override
void onSuccess(WebPassOwnPtr<WebVector<WebServiceWorkerRegistration*>> webPassRegistrations) override
{
OwnPtr<WebVector<WebServiceWorkerRegistration*>> registrations = adoptPtr(registrationsRaw);
Vector<OwnPtr<WebServiceWorkerRegistration>> registrations;
OwnPtr<WebVector<WebServiceWorkerRegistration*>> webRegistrations = webPassRegistrations.release();
for (auto& registration : *webRegistrations) {
registrations.append(adoptPtr(registration));
}
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
m_resolver->resolve(ServiceWorkerRegistrationArray::take(m_resolver.get(), registrations.release()));
m_resolver->resolve(ServiceWorkerRegistrationArray::take(m_resolver.get(), &registrations));
}
// Takes ownership of |errorRaw|.
void onError(WebServiceWorkerError* errorRaw) override
void onError(const WebServiceWorkerError& error) override
{
OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));
m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
}
private:
......@@ -154,15 +149,12 @@ class ServiceWorkerContainer::GetRegistrationForReadyCallback : public WebServic
public:
explicit GetRegistrationForReadyCallback(ReadyProperty* ready)
: m_ready(ready) { }
~GetRegistrationForReadyCallback() { }
~GetRegistrationForReadyCallback() override { }
// Takes ownership of |registrationRaw|.
void onSuccess(WebServiceWorkerRegistration* registrationRaw) override
void onSuccess(WebPassOwnPtr<WebServiceWorkerRegistration> registration) override
{
ASSERT(registrationRaw);
ASSERT(m_ready->state() == ReadyProperty::Pending);
OwnPtr<WebServiceWorkerRegistration> registration = adoptPtr(registrationRaw);
if (m_ready->executionContext() && !m_ready->executionContext()->activeDOMObjectsAreStopped())
m_ready->resolve(ServiceWorkerRegistration::create(m_ready->executionContext(), registration.release()));
}
......
third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerRegistration.h
View file @ 0fa0f1ee
......@@ -83,11 +83,11 @@ private:
class ServiceWorkerRegistrationArray {
STATIC_ONLY(ServiceWorkerRegistrationArray);
public:
static HeapVector<Member<ServiceWorkerRegistration>> take(ScriptPromiseResolver* resolver, PassOwnPtr<WebVector<WebServiceWorkerRegistration*>> webServiceWorkerRegistrations)
static HeapVector<Member<ServiceWorkerRegistration>> take(ScriptPromiseResolver* resolver, Vector<OwnPtr<WebServiceWorkerRegistration>>* webServiceWorkerRegistrations)
{
HeapVector<Member<ServiceWorkerRegistration>> registrations;
for (WebServiceWorkerRegistration* registration : *webServiceWorkerRegistrations)
registrations.append(ServiceWorkerRegistration::create(resolver->executionContext(), adoptPtr(registration)));
for (auto& registration : *webServiceWorkerRegistrations)
registrations.append(ServiceWorkerRegistration::create(resolver->executionContext(), registration.release()));
return registrations;
}
};
......
third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerProvider.h
View file @ 0fa0f1ee
......@@ -32,6 +32,7 @@
#define WebServiceWorkerProvider_h
#include "public/platform/WebCallbacks.h"
#include "public/platform/WebPassOwnPtr.h"
#include "public/platform/WebServiceWorkerRegistration.h"
#include "public/platform/WebVector.h"
......@@ -51,12 +52,34 @@ public:
// events. Must be cleared before the client becomes invalid.
virtual void setClient(WebServiceWorkerProviderClient*) { }
// The WebServiceWorkerRegistration and WebServiceWorkerError ownership are
// passed to the WebServiceWorkerRegistrationCallbacks implementation.
typedef WebCallbacks<WebServiceWorkerRegistration*, WebServiceWorkerError*> WebServiceWorkerRegistrationCallbacks;
typedef WebCallbacks<WebServiceWorkerRegistration*, WebServiceWorkerError*> WebServiceWorkerGetRegistrationCallbacks;
typedef WebCallbacks<WebVector<WebServiceWorkerRegistration*>*, WebServiceWorkerError*> WebServiceWorkerGetRegistrationsCallbacks;
typedef WebCallbacks<WebServiceWorkerRegistration*, void> WebServiceWorkerGetRegistrationForReadyCallbacks;
class WebServiceWorkerRegistrationCallbacks : public WebCallbacks<WebPassOwnPtr<WebServiceWorkerRegistration>, const WebServiceWorkerError&> {
public:
void onSuccess(WebServiceWorkerRegistration* r) { onSuccess(adoptWebPtr(r)); }
void onError(WebServiceWorkerError* e)
{
onError(*e);
delete e;
}
virtual void onSuccess(WebPassOwnPtr<WebServiceWorkerRegistration>) = 0;
virtual void onError(const WebServiceWorkerError&) = 0;
};
using WebServiceWorkerGetRegistrationCallbacks = WebServiceWorkerRegistrationCallbacks;
class WebServiceWorkerGetRegistrationsCallbacks : public WebCallbacks<WebPassOwnPtr<WebVector<WebServiceWorkerRegistration*>>, const WebServiceWorkerError&> {
public:
void onSuccess(WebVector<WebServiceWorkerRegistration*>* r) { onSuccess(adoptWebPtr(r)); }
void onError(WebServiceWorkerError* e)
{
onError(*e);
delete e;
}
virtual void onSuccess(WebPassOwnPtr<WebVector<WebServiceWorkerRegistration*>>) = 0;
virtual void onError(const WebServiceWorkerError&) = 0;
};
class WebServiceWorkerGetRegistrationForReadyCallbacks : public WebCallbacks<WebPassOwnPtr<WebServiceWorkerRegistration>, void> {
public:
void onSuccess(WebServiceWorkerRegistration* r) { onSuccess(adoptWebPtr(r)); }
virtual void onSuccess(WebPassOwnPtr<WebServiceWorkerRegistration>) = 0;
};
virtual void registerServiceWorker(const WebURL& pattern, const WebURL& scriptUrl, WebServiceWorkerRegistrationCallbacks*) { }
virtual void getRegistration(const WebURL& documentURL, WebServiceWorkerGetRegistrationCallbacks*) { }
......
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