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

Side by Side Diff: Source/modules/presentation/PresentationAvailabilityCallback.cpp

Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 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 "config.h" 5 #include "config.h"
6 #include "modules/presentation/PresentationAvailabilityCallback.h" 6 #include "modules/presentation/PresentationAvailabilityCallback.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "modules/presentation/PresentationAvailability.h" 10 #include "modules/presentation/PresentationAvailability.h"
(...skipping 13 matching lines...) Expand all
24 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 24 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped())
25 return; 25 return;
26 m_resolver->resolve(PresentationAvailability::take(m_resolver.get(), *availa bility)); 26 m_resolver->resolve(PresentationAvailability::take(m_resolver.get(), *availa bility));
27 } 27 }
28 28
29 void PresentationAvailabilityCallback::onError(WebPresentationError* result) 29 void PresentationAvailabilityCallback::onError(WebPresentationError* result)
30 { 30 {
31 OwnPtr<WebPresentationError> error = adoptPtr(result); 31 OwnPtr<WebPresentationError> error = adoptPtr(result);
32 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped()) 32 if (!m_resolver->executionContext() || m_resolver->executionContext()->activ eDOMObjectsAreStopped())
33 return; 33 return;
34 m_resolver->reject(PresentationError::take(m_resolver.get(), error.release() )); 34 m_resolver->reject(PresentationError::take(m_resolver.get(), *error));
35 } 35 }
36 36
37 } // namespace blink 37 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698