Changeset 166763 in webkit

Timestamp:

Apr 3, 2014 9:11:56 PM (10 years ago)

Author:

jinwoo7.song@samsung.com

Message:

[WK2][EFL] Use template method in creating NativeWebMouseEvent
​https://bugs.webkit.org/show_bug.cgi?id=131152

Reviewed by Anders Carlsson.

There are three EFL mouse events, such as Evas_Event_Mouse_Down, Evas_Event_Mouse_Up,
and Evas_Event_Mouse_Move. They can be defined as a template method.

• PlatformEfl.cmake: Remove NativeWebMouseEventEfl.cpp
• Shared/NativeWebMouseEvent.h:

(WebKit::NativeWebMouseEvent::NativeWebMouseEvent): Add a template method.

• Shared/efl/NativeWebMouseEventEfl.cpp: Removed.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• Shared/NativeWebMouseEvent.h (modified) (3 diffs)
• Shared/efl/NativeWebMouseEventEfl.cpp (deleted)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-03  Jinwoo Song  <jinwoo7.song@samsung.com>
+
+        [WK2][EFL] Use template method in creating NativeWebMouseEvent
+        https://bugs.webkit.org/show_bug.cgi?id=131152
+
+        Reviewed by Anders Carlsson.
+
+        There are three EFL mouse events, such as Evas_Event_Mouse_Down, Evas_Event_Mouse_Up,
+        and Evas_Event_Mouse_Move. They can be defined as a template method.
+
+        * PlatformEfl.cmake: Remove NativeWebMouseEventEfl.cpp
+        * Shared/NativeWebMouseEvent.h:
+        (WebKit::NativeWebMouseEvent::NativeWebMouseEvent): Add a template method.
+        * Shared/efl/NativeWebMouseEventEfl.cpp: Removed.
+
 2014-04-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -37 +37 @@
     Shared/efl/LayerTreeContextEfl.cpp
     Shared/efl/NativeWebKeyboardEventEfl.cpp
-    Shared/efl/NativeWebMouseEventEfl.cpp
     Shared/efl/NativeWebTouchEventEfl.cpp
     Shared/efl/NativeWebWheelEventEfl.cpp

trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h

@@ -35 +35 @@
 
 #if PLATFORM(EFL)
+#include "WebEventFactory.h"
 #include <Evas.h>
 #include <WebCore/AffineTransform.h>
@@ -54 +55 @@
     NativeWebMouseEvent(GdkEvent*, int);
 #elif PLATFORM(EFL)
-    NativeWebMouseEvent(const Evas_Event_Mouse_Down*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
-    NativeWebMouseEvent(const Evas_Event_Mouse_Up*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
-    NativeWebMouseEvent(const Evas_Event_Mouse_Move*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
+    template <typename EvasEventMouse>
+    NativeWebMouseEvent(const EvasEventMouse*, const WebCore::AffineTransform&, const WebCore::AffineTransform&);
 #endif
 
@@ -79 +79 @@
 };
 
+#if PLATFORM(EFL)
+template <typename EvasEventMouse>
+NativeWebMouseEvent::NativeWebMouseEvent(const EvasEventMouse* event, const WebCore::AffineTransform& toWebContent, const WebCore::AffineTransform& toDeviceScreen)
+    : WebMouseEvent(WebEventFactory::createWebMouseEvent(event, toWebContent, toDeviceScreen))
+    , m_nativeEvent(event)
+{
+}
+#endif
+
 } // namespace WebKit