Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(845)

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerWindowClientCallback.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h" 5 #include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h" 7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "core/dom/DOMException.h" 8 #include "core/dom/DOMException.h"
9 #include "modules/serviceworkers/ServiceWorkerError.h" 9 #include "modules/serviceworkers/ServiceWorkerError.h"
10 #include "modules/serviceworkers/ServiceWorkerWindowClient.h" 10 #include "modules/serviceworkers/ServiceWorkerWindowClient.h"
11 #include "wtf/PtrUtil.h"
12 11
13 namespace blink { 12 namespace blink {
14 13
15 void NavigateClientCallback::onSuccess(std::unique_ptr<WebServiceWorkerClientInf o> clientInfo) 14 void NavigateClientCallback::onSuccess(std::unique_ptr<WebServiceWorkerClientInf o> clientInfo)
16 { 15 {
17 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped()) 16 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped())
18 return; 17 return;
19 m_resolver->resolve(ServiceWorkerWindowClient::take(m_resolver.get(), wrapUn ique(clientInfo.release()))); 18 m_resolver->resolve(ServiceWorkerWindowClient::take(m_resolver.get(), adoptP tr(clientInfo.release())));
20 } 19 }
21 20
22 void NavigateClientCallback::onError(const WebServiceWorkerError& error) 21 void NavigateClientCallback::onError(const WebServiceWorkerError& error)
23 { 22 {
24 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped()) 23 if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()- >activeDOMObjectsAreStopped())
25 return; 24 return;
26 25
27 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) { 26 if (error.errorType == WebServiceWorkerError::ErrorTypeNavigation) {
28 ScriptState::Scope scope(m_resolver->getScriptState()); 27 ScriptState::Scope scope(m_resolver->getScriptState());
29 m_resolver->reject(V8ThrowException::createTypeError(m_resolver->getScri ptState()->isolate(), error.message)); 28 m_resolver->reject(V8ThrowException::createTypeError(m_resolver->getScri ptState()->isolate(), error.message));
30 return; 29 return;
31 } 30 }
32 31
33 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error)); 32 m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error));
34 } 33 }
35 34
36 } // namespace blink 35 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698