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

Side by Side Diff: Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "modules/push_messaging/PushSubscriptionCallbacks.h" 6 #include "modules/push_messaging/PushSubscriptionCallbacks.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "modules/push_messaging/PushError.h" 9 #include "modules/push_messaging/PushError.h"
10 #include "modules/push_messaging/PushSubscription.h" 10 #include "modules/push_messaging/PushSubscription.h"
(...skipping 23 matching lines...) Expand all
34 return; 34 return;
35 } 35 }
36 m_resolver->resolve(PushSubscription::take(m_resolver.get(), webPushSubscrip tion, m_serviceWorkerRegistration)); 36 m_resolver->resolve(PushSubscription::take(m_resolver.get(), webPushSubscrip tion, m_serviceWorkerRegistration));
37 } 37 }
38 38
39 void PushSubscriptionCallbacks::onError(WebPushError* error) 39 void PushSubscriptionCallbacks::onError(WebPushError* error)
40 { 40 {
41 OwnPtr<WebPushError> ownError = adoptPtr(error); 41 OwnPtr<WebPushError> ownError = adoptPtr(error);
42 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 42 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped())
43 return; 43 return;
44 m_resolver->reject(PushError::take(m_resolver.get(), ownError.release())); 44 m_resolver->reject(PushError::take(m_resolver.get(), *ownError));
45 } 45 }
46 46
47 } // namespace blink 47 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698