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

Side by Side Diff: Source/modules/bluetooth/Bluetooth.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: smaller review updates 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 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/bluetooth/Bluetooth.h" 6 #include "modules/bluetooth/Bluetooth.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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 if (!webbluetooth) 62 if (!webbluetooth)
63 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); 63 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError));
64 64
65 // 3. In order to convert the arguments from service names and aliases to ju st UUIDs, do the following substeps: 65 // 3. In order to convert the arguments from service names and aliases to ju st UUIDs, do the following substeps:
66 WebRequestDeviceOptions webOptions; 66 WebRequestDeviceOptions webOptions;
67 convertRequestDeviceOptions(options, webOptions, exceptionState); 67 convertRequestDeviceOptions(options, webOptions, exceptionState);
68 if (exceptionState.hadException()) 68 if (exceptionState.hadException())
69 return exceptionState.reject(scriptState); 69 return exceptionState.reject(scriptState);
70 70
71 // Subsequent steps are handled in the browser process. 71 // Subsequent steps are handled in the browser process.
72 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); 72 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
73 ScriptPromise promise = resolver->promise(); 73 ScriptPromise promise = resolver->promise();
74 webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<Bluetooth Device, BluetoothError>(resolver)); 74 webbluetooth->requestDevice(webOptions, new CallbackPromiseAdapter<Bluetooth Device, BluetoothError>(resolver));
75 return promise; 75 return promise;
76 76
77 } 77 }
78 78
79 } // namespace blink 79 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698