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

Side by Side Diff: Source/modules/vr/NavigatorVRDevice.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix webusb ScriptPromiseResolver usage 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
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/vr/NavigatorVRDevice.h" 6 #include "modules/vr/NavigatorVRDevice.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 "core/dom/Document.h" 10 #include "core/dom/Document.h"
(...skipping 30 matching lines...) Expand all
41 return *supplement; 41 return *supplement;
42 } 42 }
43 43
44 ScriptPromise NavigatorVRDevice::getVRDevices(ScriptState* scriptState, Navigato r& navigator) 44 ScriptPromise NavigatorVRDevice::getVRDevices(ScriptState* scriptState, Navigato r& navigator)
45 { 45 {
46 return NavigatorVRDevice::from(navigator).getVRDevices(scriptState); 46 return NavigatorVRDevice::from(navigator).getVRDevices(scriptState);
47 } 47 }
48 48
49 ScriptPromise NavigatorVRDevice::getVRDevices(ScriptState* scriptState) 49 ScriptPromise NavigatorVRDevice::getVRDevices(ScriptState* scriptState)
50 { 50 {
51 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 51 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
52 ScriptPromise promise = resolver->promise(); 52 ScriptPromise promise = resolver->promise();
53 53
54 Document* document = m_frame ? m_frame->document() : 0; 54 Document* document = m_frame ? m_frame->document() : 0;
55 55
56 if (!document || !controller()) { 56 if (!document || !controller()) {
57 DOMException* exception = DOMException::create(InvalidStateError, "The o bject is no longer associated to a document."); 57 DOMException* exception = DOMException::create(InvalidStateError, "The o bject is no longer associated to a document.");
58 resolver->reject(exception); 58 resolver->reject(exception);
59 return promise; 59 return promise;
60 } 60 }
61 61
(...skipping 27 matching lines...) Expand all
89 NavigatorVRDevice::~NavigatorVRDevice() 89 NavigatorVRDevice::~NavigatorVRDevice()
90 { 90 {
91 } 91 }
92 92
93 const char* NavigatorVRDevice::supplementName() 93 const char* NavigatorVRDevice::supplementName()
94 { 94 {
95 return "NavigatorVRDevice"; 95 return "NavigatorVRDevice";
96 } 96 }
97 97
98 } // namespace blink 98 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerWindowClient.cpp ('k') | Source/modules/vr/VRGetDevicesCallback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698