Use PRUnichar for Gecko < 29, char16_t otherwise.

See https://bugzilla.mozilla.org/show_bug.cgi?id=927728

Author: jleyba

cpp/webdriver-firefox/native_ime.cpp

@@ -93,7 +93,11 @@ NS_IMETHODIMP nsNativeIME::ImeGetActiveEngine(nsAString &activeEngine)
     LOG(DEBUG) << "Active engine:" << engine;
     std::wstring wengine(engine.begin(), engine.end());
     // We know that PRUnichar* is wchar_t*. see comment in sendKeys
+#ifdef WEBDRIVER_LEGACY_GECKO
     activeEngine.Assign((const PRUnichar*) wengine.c_str(), wengine.length());
+#else
+    activeEngine.Assign((const nsAString::char_type*) wengine.c_str(), wengine.length());
+#endif  // WEBDRIVER_LEGACY_GECKO
     tryToCloseImeLib(handler, lib);
     return NS_OK;
   }

cpp/webdriver-firefox/native_keyboard.cpp

@@ -53,7 +53,11 @@ nsNativeKeyboard::~nsNativeKeyboard()
 
 /* void SendKeys (in nsISupports aNode, in wstring value); */
 NS_IMETHODIMP nsNativeKeyboard::SendKeys(nsISupports *aNode,
+#ifdef WEBDRIVER_LEGACY_GECKO
     const PRUnichar *value,
+#else
+    const char16_t *value,
+#endif  // WEBDRIVER_LEGACY_GECKO
     bool releaseModifiers)
 {
   LOG(DEBUG) << "---------- Got to start of callback. aNode: " << aNode

cpp/webdriver-firefox/nsINativeKeyboard.h

@@ -1,5 +1,9 @@
 #ifdef GECKO_100_COMPATIBILITY
 #include "nsINativeKeyboard_g10.h"
 #else
+#ifdef WEBDRIVER_LEGACY_GECKO
 #include "nsINativeKeyboard_g16.h"
+#else
+#include "nsINativeKeyboard_g29.h"
+#endif
 #endif

cpp/webdriver-firefox/nsINativeKeyboard_g29.h

@@ -0,0 +1,95 @@
+/*
+ * DO NOT EDIT.  THIS FILE IS GENERATED FROM cpp/webdriver-firefox/nsINativeKeyboard.idl
+ */
+
+#ifndef __gen_nsINativeKeyboard_h__
+#define __gen_nsINativeKeyboard_h__
+
+
+#ifndef __gen_nsISupports_h__
+#include "nsISupports.h"
+#endif
+
+#ifndef __gen_nsISupportsPrimitives_h__
+#include "nsISupportsPrimitives.h"
+#endif
+
+/* For IDL files that don't want to include root IDL files. */
+#ifndef NS_NO_VTABLE
+#define NS_NO_VTABLE
+#endif
+
+/* starting interface:    nsINativeKeyboard */
+#define NS_INATIVEKEYBOARD_IID_STR "50380a2d-ab4f-4b3f-9a27-cc7dbba07ee7"
+
+#define NS_INATIVEKEYBOARD_IID \
+  {0x50380a2d, 0xab4f, 0x4b3f, \
+    { 0x9a, 0x27, 0xcc, 0x7d, 0xbb, 0xa0, 0x7e, 0xe7 }}
+
+class NS_NO_VTABLE nsINativeKeyboard : public nsISupports {
+ public: 
+
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_INATIVEKEYBOARD_IID)
+
+  /* void sendKeys (in nsISupports aNode, in wstring value, in boolean releaseModifiers); */
+  NS_IMETHOD SendKeys(nsISupports *aNode, const char16_t * value, bool releaseModifiers) = 0;
+
+};
+
+  NS_DEFINE_STATIC_IID_ACCESSOR(nsINativeKeyboard, NS_INATIVEKEYBOARD_IID)
+
+/* Use this macro when declaring classes that implement this interface. */
+#define NS_DECL_NSINATIVEKEYBOARD \
+  NS_IMETHOD SendKeys(nsISupports *aNode, const char16_t * value, bool releaseModifiers); 
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object. */
+#define NS_FORWARD_NSINATIVEKEYBOARD(_to) \
+  NS_IMETHOD SendKeys(nsISupports *aNode, const char16_t * value, bool releaseModifiers) { return _to SendKeys(aNode, value, releaseModifiers); } 
+
+/* Use this macro to declare functions that forward the behavior of this interface to another object in a safe way. */
+#define NS_FORWARD_SAFE_NSINATIVEKEYBOARD(_to) \
+  NS_IMETHOD SendKeys(nsISupports *aNode, const char16_t * value, bool releaseModifiers) { return !_to ? NS_ERROR_NULL_POINTER : _to->SendKeys(aNode, value, releaseModifiers); } 
+
+#if 0
+/* Use the code below as a template for the implementation class for this interface. */
+
+/* Header file */
+class nsNativeKeyboard : public nsINativeKeyboard
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSINATIVEKEYBOARD
+
+  nsNativeKeyboard();
+
+private:
+  ~nsNativeKeyboard();
+
+protected:
+  /* additional members */
+};
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(nsNativeKeyboard, nsINativeKeyboard)
+
+nsNativeKeyboard::nsNativeKeyboard()
+{
+  /* member initializers and constructor code */
+}
+
+nsNativeKeyboard::~nsNativeKeyboard()
+{
+  /* destructor code */
+}
+
+/* void sendKeys (in nsISupports aNode, in wstring value, in boolean releaseModifiers); */
+NS_IMETHODIMP nsNativeKeyboard::SendKeys(nsISupports *aNode, const char16_t * value, bool releaseModifiers)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* End of implementation class template. */
+#endif
+
+
+#endif /* __gen_nsINativeKeyboard_h__ */

rake-tasks/crazy_fun/mappings/gcc.rb

@@ -216,6 +216,9 @@ def handle(fun, dir, args)
         std = ""
       end
       base_compiler_args = "-Wall -fPIC -fshort-wchar -std=c++#{std} -Dunix -D__STDC_LIMIT_MACROS -I cpp/webdriver-interactions -I cpp/imehandler/common -I #{gecko_sdk}include -I #{gecko_sdk}include/nspr " + "`pkg-config gtk+-2.0 --cflags`"
+      if (args[:geckoversion].to_i < 29)
+        base_compiler_args += " -DWEBDRIVER_LEGACY_GECKO"
+      end
       compiler_args = [args[:args], base_compiler_args].join " "
       if (args[:geckoversion].to_i < 22)
         linker_args = "-Wall -fshort-wchar -fno-rtti -fno-exceptions -shared -fPIC -L#{gecko_sdk}lib -L#{gecko_sdk}bin -Wl,-rpath-link,#{gecko_sdk}bin -l#{xpcom_lib} -lxpcom -lnspr4 -lrt `pkg-config gtk+-2.0 --libs`"