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

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

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: keepAliveWhilePending() comment Created 5 years, 5 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 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/presentation/Presentation.h" 6 #include "modules/presentation/Presentation.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptPromiseResolver.h" 10 #include "bindings/core/v8/ScriptPromiseResolver.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 DOMWindowProperty::trace(visitor); 80 DOMWindowProperty::trace(visitor);
81 } 81 }
82 82
83 PresentationSession* Presentation::session() const 83 PresentationSession* Presentation::session() const
84 { 84 {
85 return m_session.get(); 85 return m_session.get();
86 } 86 }
87 87
88 ScriptPromise Presentation::startSession(ScriptState* state, const String& prese ntationUrl) 88 ScriptPromise Presentation::startSession(ScriptState* state, const String& prese ntationUrl)
89 { 89 {
90 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(state); 90 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(state);
91 ScriptPromise promise = resolver->promise(); 91 ScriptPromise promise = resolver->promise();
92 92
93 WebPresentationClient* client = presentationClient(executionContext()); 93 WebPresentationClient* client = presentationClient(executionContext());
94 if (!client) { 94 if (!client) {
95 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame.")); 95 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame."));
96 return promise; 96 return promise;
97 } 97 }
98 client->startSession(presentationUrl, new PresentationSessionClientCallbacks (resolver, this)); 98 client->startSession(presentationUrl, new PresentationSessionClientCallbacks (resolver, this));
99 99
100 return promise; 100 return promise;
101 } 101 }
102 102
103 ScriptPromise Presentation::joinSession(ScriptState* state, const String& presen tationUrl, const String& presentationId) 103 ScriptPromise Presentation::joinSession(ScriptState* state, const String& presen tationUrl, const String& presentationId)
104 { 104 {
105 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(state); 105 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(state);
106 ScriptPromise promise = resolver->promise(); 106 ScriptPromise promise = resolver->promise();
107 107
108 WebPresentationClient* client = presentationClient(executionContext()); 108 WebPresentationClient* client = presentationClient(executionContext());
109 if (!client) { 109 if (!client) {
110 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame.")); 110 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame."));
111 return promise; 111 return promise;
112 } 112 }
113 client->joinSession(presentationUrl, presentationId, new PresentationSession ClientCallbacks(resolver, this)); 113 client->joinSession(presentationUrl, presentationId, new PresentationSession ClientCallbacks(resolver, this));
114 114
115 return promise; 115 return promise;
116 } 116 }
117 117
118 ScriptPromise Presentation::getAvailability(ScriptState* state, const String& pr esentationUrl) 118 ScriptPromise Presentation::getAvailability(ScriptState* state, const String& pr esentationUrl)
119 { 119 {
120 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(state); 120 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(state);
121 ScriptPromise promise = resolver->promise(); 121 ScriptPromise promise = resolver->promise();
122 122
123 WebPresentationClient* client = presentationClient(executionContext()); 123 WebPresentationClient* client = presentationClient(executionContext());
124 if (!client) { 124 if (!client) {
125 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame.")); 125 resolver->reject(DOMException::create(InvalidStateError, "The object is no longer attached to the frame."));
126 return promise; 126 return promise;
127 } 127 }
128 client->getAvailability(presentationUrl, new PresentationAvailabilityCallbac k(resolver)); 128 client->getAvailability(presentationUrl, new PresentationAvailabilityCallbac k(resolver));
129 129
130 return promise; 130 return promise;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 PresentationSession* Presentation::findSession(WebPresentationSessionClient* ses sionClient) 190 PresentationSession* Presentation::findSession(WebPresentationSessionClient* ses sionClient)
191 { 191 {
192 for (const auto& session : m_openSessions) { 192 for (const auto& session : m_openSessions) {
193 if (session->matches(sessionClient)) 193 if (session->matches(sessionClient))
194 return session.get(); 194 return session.get();
195 } 195 }
196 return nullptr; 196 return nullptr;
197 } 197 }
198 198
199 } // namespace blink 199 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698