Updating Gamepad API to match latest spec

content/browser/gamepad/gamepad_platform_data_fetcher_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gamepad/gamepad_platform_data_fetcher_linux.h"
 
 #include <fcntl.h>
 #include <libudev.h>
 #include <linux/joystick.h>
 #include <string.h>
@@ skipping 163 matching lines @@
 
         // Replace the previous name string with one containing the better
         // information, again driver returns utf-8 strings here so combine
         // in utf-8 for conversion to WebUChar below.
         name_string = base::StringPrintf("%s %s", manufacturer, product);
       }
     }
 
     // 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 " : "",
         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);
+#endif
 
     pad.connected = true;
   }
 }
 
 void GamepadPlatformDataFetcherLinux::EnumerateDevices() {
   udev_enumerate* enumerate = udev_enumerate_new(udev_->udev_handle());
   if (!enumerate)
     return;
   int ret = udev_enumerate_add_match_subsystem(enumerate, kInputSubsystem);
@@ skipping 45 matching lines @@
         continue;
       pad.buttons[item] = event.value ? 1.0 : 0.0;
       if (item >= pad.buttonsLength)
         pad.buttonsLength = item + 1;
     }
     pad.timestamp = event.time;
   }
 }
 
 }  // namespace content