| Index: content/shell/renderer/test_runner/gamepad_controller.cc
|
| diff --git a/content/shell/renderer/test_runner/gamepad_controller.cc b/content/shell/renderer/test_runner/gamepad_controller.cc
|
| index 4ec597e3dd70be91c2c07c3e28088db1b42d4096..32f11364dbde8984777775ed99804c1e4786d4fc 100644
|
| --- a/content/shell/renderer/test_runner/gamepad_controller.cc
|
| +++ b/content/shell/renderer/test_runner/gamepad_controller.cc
|
| @@ -136,8 +136,17 @@ void GamepadControllerBindings::SetAxisData(int index, int axis, double data) {
|
| controller_->SetAxisData(index, axis, data);
|
| }
|
|
|
| +// static
|
| +base::WeakPtr<GamepadController> GamepadController::Create(WebTestDelegate* delegate) {
|
| + CHECK(delegate);
|
| +
|
| + GamepadController* controller = new GamepadController();
|
| + delegate->setGamepadProvider(scoped_ptr<RendererGamepadProvider>(controller));
|
| + return controller->weak_factory_.GetWeakPtr();
|
| +}
|
| +
|
| GamepadController::GamepadController()
|
| - : listener_(NULL),
|
| + : RendererGamepadProvider(0),
|
| weak_factory_(this) {
|
| Reset();
|
| }
|
| @@ -152,19 +161,19 @@ void GamepadController::Install(WebFrame* frame) {
|
| GamepadControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
|
| }
|
|
|
| -void GamepadController::SetDelegate(WebTestDelegate* delegate) {
|
| - if (!delegate)
|
| - return;
|
| - delegate->setGamepadProvider(this);
|
| -}
|
|
|
| void GamepadController::SampleGamepads(blink::WebGamepads& gamepads) {
|
| memcpy(&gamepads, &gamepads_, sizeof(blink::WebGamepads));
|
| }
|
|
|
| -void GamepadController::SetGamepadListener(
|
| - blink::WebGamepadListener* listener) {
|
| - listener_ = listener;
|
| +bool GamepadController::OnControlMessageReceived(const IPC::Message& msg) {
|
| + return false;
|
| +}
|
| +
|
| +void GamepadController::SendStartMessage() {
|
| +}
|
| +
|
| +void GamepadController::SendStopMessage() {
|
| }
|
|
|
| void GamepadController::Connect(int index) {
|
| @@ -183,8 +192,8 @@ void GamepadController::DispatchConnected(int index) {
|
| || !gamepads_.items[index].connected)
|
| return;
|
| const WebGamepad& pad = gamepads_.items[index];
|
| - if (listener_)
|
| - listener_->didConnectGamepad(index, pad);
|
| + if (listener())
|
| + listener()->didConnectGamepad(index, pad);
|
| }
|
|
|
| void GamepadController::Disconnect(int index) {
|
| @@ -197,8 +206,8 @@ void GamepadController::Disconnect(int index) {
|
| if (gamepads_.items[i].connected)
|
| gamepads_.length = i + 1;
|
| }
|
| - if (listener_)
|
| - listener_->didDisconnectGamepad(index, pad);
|
| + if (listener())
|
| + listener()->didDisconnectGamepad(index, pad);
|
| }
|
|
|
| void GamepadController::SetId(int index, const std::string& src) {
|
|
|