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

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

Issue 1317243002: [VR, Permission] Use appopriate type parameters for WebCallbacks (1/3) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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
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/VRHardwareUnitCollection.h" 6 #include "modules/vr/VRHardwareUnitCollection.h"
7 7
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/dom/ExceptionCode.h" 10 #include "core/dom/ExceptionCode.h"
11 #include "core/frame/LocalDOMWindow.h" 11 #include "core/frame/LocalDOMWindow.h"
12 #include "core/frame/LocalFrame.h" 12 #include "core/frame/LocalFrame.h"
13 #include "core/frame/Navigator.h" 13 #include "core/frame/Navigator.h"
14 #include "core/page/Page.h" 14 #include "core/page/Page.h"
15 #include "modules/vr/HMDVRDevice.h" 15 #include "modules/vr/HMDVRDevice.h"
16 #include "modules/vr/NavigatorVRDevice.h" 16 #include "modules/vr/NavigatorVRDevice.h"
17 #include "modules/vr/PositionSensorVRDevice.h" 17 #include "modules/vr/PositionSensorVRDevice.h"
18 #include "modules/vr/VRController.h" 18 #include "modules/vr/VRController.h"
19 #include "modules/vr/VRGetDevicesCallback.h" 19 #include "modules/vr/VRGetDevicesCallback.h"
20 #include "modules/vr/VRHardwareUnit.h" 20 #include "modules/vr/VRHardwareUnit.h"
21 #include "modules/vr/VRPositionState.h" 21 #include "modules/vr/VRPositionState.h"
22 22
23 namespace blink { 23 namespace blink {
24 24
25 VRHardwareUnitCollection::VRHardwareUnitCollection(VRController* controller) 25 VRHardwareUnitCollection::VRHardwareUnitCollection(VRController* controller)
26 : m_controller(controller) 26 : m_controller(controller)
27 { 27 {
28 } 28 }
29 29
30 HeapVector<Member<VRDevice>> VRHardwareUnitCollection::updateVRHardwareUnits(con st WebVector<WebVRDevice>* devices) 30 HeapVector<Member<VRDevice>> VRHardwareUnitCollection::updateVRHardwareUnits(con st WebVector<WebVRDevice>& devices)
31 { 31 {
32 VRDeviceVector vrDevices; 32 VRDeviceVector vrDevices;
33 33
34 if (!devices) 34 for (const auto& device : devices) {
35 return vrDevices;
36
37 for (size_t i = 0; i < devices->size(); ++i) {
38 const WebVRDevice& device = (*devices)[i];
39
40 VRHardwareUnit* hardwareUnit = getHardwareUnitForIndex(device.index); 35 VRHardwareUnit* hardwareUnit = getHardwareUnitForIndex(device.index);
41 if (!hardwareUnit) { 36 if (!hardwareUnit) {
42 hardwareUnit = new VRHardwareUnit(m_controller); 37 hardwareUnit = new VRHardwareUnit(m_controller);
43 m_hardwareUnits.append(hardwareUnit); 38 m_hardwareUnits.append(hardwareUnit);
44 } 39 }
45 40
46 hardwareUnit->updateFromWebVRDevice(device); 41 hardwareUnit->updateFromWebVRDevice(device);
47 hardwareUnit->addDevicesToVector(vrDevices); 42 hardwareUnit->addDevicesToVector(vrDevices);
48 } 43 }
49 44
(...skipping 13 matching lines...) Expand all
63 return 0; 58 return 0;
64 } 59 }
65 60
66 DEFINE_TRACE(VRHardwareUnitCollection) 61 DEFINE_TRACE(VRHardwareUnitCollection)
67 { 62 {
68 visitor->trace(m_controller); 63 visitor->trace(m_controller);
69 visitor->trace(m_hardwareUnits); 64 visitor->trace(m_hardwareUnits);
70 } 65 }
71 66
72 } // namespace blink 67 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/vr/VRHardwareUnitCollection.h ('k') | public/platform/modules/permissions/WebPermissionClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698