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

Side by Side Diff: content/shell/renderer/test_runner/gamepad_controller.cc

Issue 583113002: Abstract class WebTestDelegate to chromium c++ style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test_runner Created 6 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
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 "content/shell/renderer/test_runner/gamepad_controller.h" 5 #include "content/shell/renderer/test_runner/gamepad_controller.h"
6 6
7 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 7 #include "content/shell/renderer/test_runner/web_test_delegate.h"
8 #include "gin/arguments.h" 8 #include "gin/arguments.h"
9 #include "gin/handle.h" 9 #include "gin/handle.h"
10 #include "gin/object_template_builder.h" 10 #include "gin/object_template_builder.h"
11 #include "gin/wrappable.h" 11 #include "gin/wrappable.h"
12 #include "third_party/WebKit/public/platform/WebGamepadListener.h" 12 #include "third_party/WebKit/public/platform/WebGamepadListener.h"
13 #include "third_party/WebKit/public/web/WebFrame.h" 13 #include "third_party/WebKit/public/web/WebFrame.h"
14 #include "third_party/WebKit/public/web/WebKit.h" 14 #include "third_party/WebKit/public/web/WebKit.h"
15 #include "v8/include/v8.h" 15 #include "v8/include/v8.h"
16 16
17 using blink::WebFrame; 17 using blink::WebFrame;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void GamepadControllerBindings::SetAxisData(int index, int axis, double data) { 134 void GamepadControllerBindings::SetAxisData(int index, int axis, double data) {
135 if (controller_) 135 if (controller_)
136 controller_->SetAxisData(index, axis, data); 136 controller_->SetAxisData(index, axis, data);
137 } 137 }
138 138
139 // static 139 // static
140 base::WeakPtr<GamepadController> GamepadController::Create(WebTestDelegate* dele gate) { 140 base::WeakPtr<GamepadController> GamepadController::Create(WebTestDelegate* dele gate) {
141 CHECK(delegate); 141 CHECK(delegate);
142 142
143 GamepadController* controller = new GamepadController(); 143 GamepadController* controller = new GamepadController();
144 delegate->setGamepadProvider(scoped_ptr<RendererGamepadProvider>(controller)); 144 delegate->SetGamepadProvider(scoped_ptr<RendererGamepadProvider>(controller));
145 return controller->weak_factory_.GetWeakPtr(); 145 return controller->weak_factory_.GetWeakPtr();
146 } 146 }
147 147
148 GamepadController::GamepadController() 148 GamepadController::GamepadController()
149 : RendererGamepadProvider(0), 149 : RendererGamepadProvider(0),
150 weak_factory_(this) { 150 weak_factory_(this) {
151 Reset(); 151 Reset();
152 } 152 }
153 153
154 GamepadController::~GamepadController() {} 154 GamepadController::~GamepadController() {}
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 246
247 void GamepadController::SetAxisData(int index, int axis, double data) { 247 void GamepadController::SetAxisData(int index, int axis, double data) {
248 if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap)) 248 if (index < 0 || index >= static_cast<int>(WebGamepads::itemsLengthCap))
249 return; 249 return;
250 if (axis < 0 || axis >= static_cast<int>(WebGamepad::axesLengthCap)) 250 if (axis < 0 || axis >= static_cast<int>(WebGamepad::axesLengthCap))
251 return; 251 return;
252 gamepads_.items[index].axes[axis] = data; 252 gamepads_.items[index].axes[axis] = data;
253 } 253 }
254 254
255 } // namespace content 255 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/event_sender.cc ('k') | content/shell/renderer/test_runner/mock_color_chooser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698