Index: Source/testing/runner/GamepadController.cpp |
diff --git a/Source/testing/runner/GamepadController.cpp b/Source/testing/runner/GamepadController.cpp |
index 85d8321d4ec39322cb15c7dfb2e6e59895970507..e1208710459301d56459e7cf99368abcab64a101 100644 |
--- a/Source/testing/runner/GamepadController.cpp |
+++ b/Source/testing/runner/GamepadController.cpp |
@@ -32,7 +32,7 @@ |
#include "public/testing/WebTestDelegate.h" |
-using namespace WebKit; |
+using namespace blink; |
namespace WebTestRunner { |
@@ -73,11 +73,11 @@ void GamepadController::connect(const CppArgumentList& args, CppVariant* result) |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
m_gamepads.items[index].connected = true; |
m_gamepads.length = 0; |
- for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) |
+ for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) |
if (m_gamepads.items[i].connected) |
m_gamepads.length = i + 1; |
m_delegate->setGamepadData(m_gamepads); |
@@ -91,11 +91,11 @@ void GamepadController::disconnect(const CppArgumentList& args, CppVariant* resu |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
m_gamepads.items[index].connected = false; |
m_gamepads.length = 0; |
- for (unsigned i = 0; i < WebKit::WebGamepads::itemsLengthCap; ++i) |
+ for (unsigned i = 0; i < blink::WebGamepads::itemsLengthCap; ++i) |
if (m_gamepads.items[i].connected) |
m_gamepads.length = i + 1; |
m_delegate->setGamepadData(m_gamepads); |
@@ -109,12 +109,12 @@ void GamepadController::setId(const CppArgumentList& args, CppVariant* result) |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
std::string src = args[1].toString(); |
const char* p = src.c_str(); |
memset(m_gamepads.items[index].id, 0, sizeof(m_gamepads.items[index].id)); |
- for (unsigned i = 0; *p && i < WebKit::WebGamepad::idLengthCap - 1; ++i) |
+ for (unsigned i = 0; *p && i < blink::WebGamepad::idLengthCap - 1; ++i) |
m_gamepads.items[index].id[i] = *p++; |
m_delegate->setGamepadData(m_gamepads); |
result->setNull(); |
@@ -127,10 +127,10 @@ void GamepadController::setButtonCount(const CppArgumentList& args, CppVariant* |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
int buttons = args[1].toInt32(); |
- if (buttons < 0 || buttons >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) |
+ if (buttons < 0 || buttons >= static_cast<int>(blink::WebGamepad::buttonsLengthCap)) |
return; |
m_gamepads.items[index].buttonsLength = buttons; |
m_delegate->setGamepadData(m_gamepads); |
@@ -144,10 +144,10 @@ void GamepadController::setButtonData(const CppArgumentList& args, CppVariant* r |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
int button = args[1].toInt32(); |
- if (button < 0 || button >= static_cast<int>(WebKit::WebGamepad::buttonsLengthCap)) |
+ if (button < 0 || button >= static_cast<int>(blink::WebGamepad::buttonsLengthCap)) |
return; |
double data = args[2].toDouble(); |
m_gamepads.items[index].buttons[button] = data; |
@@ -162,10 +162,10 @@ void GamepadController::setAxisCount(const CppArgumentList& args, CppVariant* re |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
int axes = args[1].toInt32(); |
- if (axes < 0 || axes >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) |
+ if (axes < 0 || axes >= static_cast<int>(blink::WebGamepad::axesLengthCap)) |
return; |
m_gamepads.items[index].axesLength = axes; |
m_delegate->setGamepadData(m_gamepads); |
@@ -179,10 +179,10 @@ void GamepadController::setAxisData(const CppArgumentList& args, CppVariant* res |
return; |
} |
int index = args[0].toInt32(); |
- if (index < 0 || index >= static_cast<int>(WebKit::WebGamepads::itemsLengthCap)) |
+ if (index < 0 || index >= static_cast<int>(blink::WebGamepads::itemsLengthCap)) |
return; |
int axis = args[1].toInt32(); |
- if (axis < 0 || axis >= static_cast<int>(WebKit::WebGamepad::axesLengthCap)) |
+ if (axis < 0 || axis >= static_cast<int>(blink::WebGamepad::axesLengthCap)) |
return; |
double data = args[2].toDouble(); |
m_gamepads.items[index].axes[axis] = data; |