Updating Gamepad API to match latest spec

content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc

Index: content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
index 63733b21a2cbd166846d478e12a3f988b628b0d7..ee244ebf410ed57e5c038d032697b493b63f01b3 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc
@@ -181,6 +181,27 @@ void GamepadPlatformDataFetcherLinux::RefreshDevice(udev_device* dev) {
 
     // Append the vendor and product information then convert the utf-8
     // id string to WebUChar.
+#ifdef ENABLE_NEW_GAMEPAD_API

[scottmg, 2014/02/18 23:45:26]

I'm not sure I like the #ifs. How are we going to decide when to switch? Do you
know if FF de-prefixed when they updated to this spec or are they still using
mozBlah?

[bajones, 2014/02/18 23:54:04]

Sorry, I should have clarified this. These #ifdefs are only in place to allow
the blink and chrome commits to land separately and cleanly without compiler
errors. Once this is landed the Blink commit will include the #define to turn
this code on, and a final commit will remove the now unecessary #ifdef

[scottmg, 2014/02/18 23:57:30]

Gotcha, that sounds good.

My concern then is that we're breaking existing code, in both js and ppapi
interfaces. I know it's prefixed still, but I think that's still frowned upon.

(Hopefully in PPAPI it's enough to just rev the api version? But presumably
there's some work to do to service both versions in that case.)

+    std::string id = name_string + base::StringPrintf(
+        " (Vendor: %s Product: %s)",
+        vendor_id,
+        product_id);
+    base::TruncateUTF8ToByteSize(id, WebGamepad::idLengthCap - 1, &id);
+    base::string16 tmp16 = base::UTF8ToUTF16(id);
+    memset(pad.id, 0, sizeof(pad.id));
+    tmp16.copy(pad.id, arraysize(pad.id) - 1);
+
+    if (mapper) {
+      std::string mapping = "standard";
+      base::TruncateUTF8ToByteSize(mapping, WebGamepad::mappingLengthCap - 1,
+          &mapping);
+      tmp16 = base::UTF8ToUTF16(mapping);
+      memset(pad.mapping, 0, sizeof(pad.mapping));
+      tmp16.copy(pad.mapping, arraysize(pad.mapping) - 1);
+    } else {
+      pad.mapping[0] = 0;
+    }
+#else
     std::string id = name_string + base::StringPrintf(
         " (%sVendor: %s Product: %s)",
         mapper ? "STANDARD GAMEPAD " : "",
@@ -190,6 +211,7 @@ void GamepadPlatformDataFetcherLinux::RefreshDevice(udev_device* dev) {
     base::string16 tmp16 = base::UTF8ToUTF16(id);
     memset(pad.id, 0, sizeof(pad.id));
     tmp16.copy(pad.id, arraysize(pad.id) - 1);
+#endif
 
     pad.connected = true;
   }