Merge pull request #1447 from WebPlatformForEmbedded/pgorszkowski/2.38/use_analogButtonChanged_after_libwpe_1.16.1

Use analogButtonChanged with proper libwpe

Author: magomez

Source/WebCore/platform/gamepad/wpe/WPEGamepad.cpp

@@ -30,7 +30,6 @@
 #if ENABLE(GAMEPAD)
 
 #include "WPEGamepadProvider.h"
-#include <wpe/wpe.h>
 
 namespace WebCore {
 
@@ -58,12 +57,15 @@ WPEGamepad::WPEGamepad(struct wpe_gamepad_provider* provider, uintptr_t gamepadI
             auto& self = *static_cast<WPEGamepad*>(data);
             self.absoluteAxisChanged(static_cast<unsigned>(axis), value);
         },
+#if WPE_CHECK_VERSION(1, 16, 1)
         // analog_button_value
-        [](void* data, enum wpe_gamepad_button button, double value) {
+        [](void* data, enum wpe_gamepad_button button, double value) {1111
             auto& self = *static_cast<WPEGamepad*>(data);
             self.analogButtonChanged(static_cast<unsigned>(button), value);
-        },
-        nullptr, nullptr,
+        }, nullptr, nullptr
+#else
+        nullptr, nullptr, nullptr
+#endif
     };
     wpe_gamepad_set_client(m_gamepad.get(), &s_client, this);
 }
@@ -89,6 +91,7 @@ void WPEGamepad::absoluteAxisChanged(unsigned axis, double value)
     WPEGamepadProvider::singleton().scheduleInputNotification(*this, WPEGamepadProvider::ShouldMakeGamepadsVisible::Yes);
 }
 
+#if WPE_CHECK_VERSION(1, 16, 1)
 void WPEGamepad::analogButtonChanged(unsigned button, double value)
 {
     m_lastUpdateTime = MonotonicTime::now();
@@ -97,6 +100,7 @@ void WPEGamepad::analogButtonChanged(unsigned button, double value)
     WPEGamepadProvider::singleton().scheduleInputNotification(*this, WPEGamepadProvider::ShouldMakeGamepadsVisible::Yes);
 
 }
+#endif
 
 } // namespace WebCore
 

Source/WebCore/platform/gamepad/wpe/WPEGamepad.h

@@ -29,6 +29,7 @@
 #if ENABLE(GAMEPAD)
 
 #include "PlatformGamepad.h"
+#include <wpe/wpe.h>
 
 struct wpe_gamepad;
 struct wpe_gamepad_provider;
@@ -48,7 +49,9 @@ class WPEGamepad final : public PlatformGamepad {
 private:
     void buttonPressedOrReleased(unsigned, bool);
     void absoluteAxisChanged(unsigned, double);
+#if WPE_CHECK_VERSION(1, 16, 1)
     void analogButtonChanged(unsigned, double);
+#endif
 
     Vector<SharedGamepadValue> m_buttonValues;
     Vector<SharedGamepadValue> m_axisValues;