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

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

Issue 1399623003: bluetooth: Change BluetoothSupplement::from(ScriptState*) to from(LocalFrame*) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: Add assert for supplement and changed to use executionContext Created 5 years, 2 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/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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 Vector<String> BluetoothDevice::uuids() 71 Vector<String> BluetoothDevice::uuids()
72 { 72 {
73 Vector<String> uuids(m_webDevice->uuids.size()); 73 Vector<String> uuids(m_webDevice->uuids.size());
74 for (size_t i = 0; i < m_webDevice->uuids.size(); ++i) 74 for (size_t i = 0; i < m_webDevice->uuids.size(); ++i)
75 uuids[i] = m_webDevice->uuids[i]; 75 uuids[i] = m_webDevice->uuids[i];
76 return uuids; 76 return uuids;
77 } 77 }
78 78
79 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState) 79 ScriptPromise BluetoothDevice::connectGATT(ScriptState* scriptState)
80 { 80 {
81 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState); 81 WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptStat e);
82 if (!webbluetooth) 82 if (!webbluetooth)
83 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); 83 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError));
84 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 84 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
85 ScriptPromise promise = resolver->promise(); 85 ScriptPromise promise = resolver->promise();
86 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver)); 86 webbluetooth->connectGATT(instanceID(), new CallbackPromiseAdapter<Bluetooth GATTRemoteServer, BluetoothError>(resolver));
87 return promise; 87 return promise;
88 } 88 }
89 89
90 } // namespace blink 90 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698