Index: device/gamepad/gamepad_standard_mappings_mac.mm |
diff --git a/device/gamepad/gamepad_standard_mappings_mac.mm b/device/gamepad/gamepad_standard_mappings_mac.mm |
index 5fb8f090307cdba8d411e7d1b94fc554bbd15ddb..27e12ce6898b507a4bddf67ad7dbf43ddf797458 100644 |
--- a/device/gamepad/gamepad_standard_mappings_mac.mm |
+++ b/device/gamepad/gamepad_standard_mappings_mac.mm |
@@ -11,8 +11,7 @@ namespace device { |
namespace { |
-void MapperXbox360Gamepad(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperXbox360Gamepad(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_LEFT_TRIGGER] = AxisToButton(input.axes[2]); |
mapped->buttons[BUTTON_INDEX_RIGHT_TRIGGER] = AxisToButton(input.axes[5]); |
@@ -31,8 +30,7 @@ void MapperXbox360Gamepad(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperXboxOneHidGamepad(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperXboxOneHidGamepad(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
@@ -54,8 +52,7 @@ void MapperXboxOneHidGamepad(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperPlaystationSixAxis(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperPlaystationSixAxis(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[14]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[13]; |
@@ -91,8 +88,7 @@ void MapperPlaystationSixAxis(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperDualshock4(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperDualshock4(const Gamepad& input, Gamepad* mapped) { |
enum Dualshock4Buttons { |
DUALSHOCK_BUTTON_TOUCHPAD = BUTTON_INDEX_COUNT, |
DUALSHOCK_BUTTON_COUNT |
@@ -120,7 +116,7 @@ void MapperDualshock4(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperIBuffalo(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperIBuffalo(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[1]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[0]; |
@@ -139,8 +135,7 @@ void MapperIBuffalo(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
mapped->axes_length = 2; |
} |
-void MapperDirectInputStyle(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperDirectInputStyle(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[1]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[2]; |
@@ -151,8 +146,7 @@ void MapperDirectInputStyle(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperMacallyIShock(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperMacallyIShock(const Gamepad& input, Gamepad* mapped) { |
enum IShockButtons { |
ISHOCK_BUTTON_C = BUTTON_INDEX_COUNT, |
ISHOCK_BUTTON_D, |
@@ -190,7 +184,7 @@ void MapperMacallyIShock(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperXGEAR(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperXGEAR(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[2]; |
mapped->buttons[BUTTON_INDEX_TERTIARY] = input.buttons[3]; |
@@ -206,8 +200,7 @@ void MapperXGEAR(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperSmartJoyPLUS(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperSmartJoyPLUS(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[2]; |
mapped->buttons[BUTTON_INDEX_TERTIARY] = input.buttons[3]; |
@@ -224,8 +217,7 @@ void MapperSmartJoyPLUS(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperDragonRiseGeneric(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperDragonRiseGeneric(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
DpadFromAxis(mapped, input.axes[9]); |
mapped->axes[AXIS_INDEX_LEFT_STICK_X] = input.axes[0]; |
@@ -236,8 +228,7 @@ void MapperDragonRiseGeneric(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperOnLiveWireless(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperOnLiveWireless(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[1]; |
@@ -260,7 +251,7 @@ void MapperOnLiveWireless(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperADT1(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperADT1(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[1]; |
@@ -282,7 +273,7 @@ void MapperADT1(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperNvShield(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperNvShield(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[1]; |
@@ -304,7 +295,7 @@ void MapperNvShield(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperOUYA(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperOUYA(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[3]; |
@@ -330,8 +321,7 @@ void MapperOUYA(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperRazerServal(const blink::WebGamepad& input, |
- blink::WebGamepad* mapped) { |
+void MapperRazerServal(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[1]; |
@@ -352,7 +342,7 @@ void MapperRazerServal(const blink::WebGamepad& input, |
mapped->axes_length = AXIS_INDEX_COUNT; |
} |
-void MapperMogaPro(const blink::WebGamepad& input, blink::WebGamepad* mapped) { |
+void MapperMogaPro(const Gamepad& input, Gamepad* mapped) { |
*mapped = input; |
mapped->buttons[BUTTON_INDEX_PRIMARY] = input.buttons[0]; |
mapped->buttons[BUTTON_INDEX_SECONDARY] = input.buttons[1]; |