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

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

Issue 1095323004: Oilpan: fix build after r194169. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/bluetooth/BluetoothDevice.h" 6 #include "modules/bluetooth/BluetoothDevice.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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 for (size_t i = 0; i < m_webDevice.uuids.size(); ++i) 85 for (size_t i = 0; i < m_webDevice.uuids.size(); ++i)
86 uuids[i] = m_webDevice.uuids[i]; 86 uuids[i] = m_webDevice.uuids[i];
87 return uuids; 87 return uuids;
88 } 88 }
89 89
90 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState) 90 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState)
91 { 91 {
92 WebBluetooth* webbluetooth = Platform::current()->bluetooth(); 92 WebBluetooth* webbluetooth = Platform::current()->bluetooth();
93 if (!webbluetooth) 93 if (!webbluetooth)
94 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); 94 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError));
95 RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scrip tState); 95 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState);
96 ScriptPromise promise = resolver->promise(); 96 ScriptPromise promise = resolver->promise();
97 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver)); 97 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver));
98 return promise; 98 return promise;
99 } 99 }
100 100
101 } // namespace blink 101 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698