Changeset 89211 in webkit


Ignore:
Timestamp:
Jun 18, 2011 8:44:03 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-18 Eunmi Lee <​eunmi15.lee@samsung.com>

Reviewed by Sam Weinig.

[EFL][WK2] add WebKit2 EFL port's NativeWebMouseEvent, NativeWebWheelEvent and NativeWebKeyboardEvent
​https://bugs.webkit.org/show_bug.cgi?id=61993

Add native mouse and keyboard event classes to convert EFL's events to NativeWebEvent.

  • Shared/NativeWebKeyboardEvent.h: (WebKit::NativeWebKeyboardEvent::nativeEvent):
  • Shared/NativeWebMouseEvent.h: (WebKit::NativeWebMouseEvent::nativeEvent):
  • Shared/NativeWebWheelEvent.h: (WebKit::NativeWebWheelEvent::nativeEvent):
  • Shared/efl/NativeWebKeyboardEventEfl.cpp: Added. (WebKit::NativeWebKeyboardEvent::NativeWebKeyboardEvent):
  • Shared/efl/NativeWebMouseEventEfl.cpp: Added. (WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
  • Shared/efl/NativeWebWheelEventEfl.cpp: Added. (WebKit::NativeWebWheelEvent::NativeWebWheelEvent):
  • Shared/efl/WebEventFactory.cpp: Added. (WebKit::modifiersForEvent): (WebKit::buttonForEvent): (WebKit::clickCountForEvent): (WebKit::WebEventFactory::createWebMouseEvent): (WebKit::WebEventFactory::createWebWheelEvent): (WebKit::WebEventFactory::createWebKeyboardEvent):
  • Shared/efl/WebEventFactory.h: Added.
Location:
trunk/Source/WebKit2
Files:
5 added
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r89210 r89211  
     12011-06-18  Eunmi Lee  <eunmi15.lee@samsung.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        [EFL][WK2] add WebKit2 EFL port's NativeWebMouseEvent, NativeWebWheelEvent and NativeWebKeyboardEvent
     6        https://bugs.webkit.org/show_bug.cgi?id=61993
     7
     8        Add native mouse and keyboard event classes to convert EFL's events to NativeWebEvent.
     9
     10        * Shared/NativeWebKeyboardEvent.h:
     11        (WebKit::NativeWebKeyboardEvent::nativeEvent):
     12        * Shared/NativeWebMouseEvent.h:
     13        (WebKit::NativeWebMouseEvent::nativeEvent):
     14        * Shared/NativeWebWheelEvent.h:
     15        (WebKit::NativeWebWheelEvent::nativeEvent):
     16        * Shared/efl/NativeWebKeyboardEventEfl.cpp: Added.
     17        (WebKit::NativeWebKeyboardEvent::NativeWebKeyboardEvent):
     18        * Shared/efl/NativeWebMouseEventEfl.cpp: Added.
     19        (WebKit::NativeWebMouseEvent::NativeWebMouseEvent):
     20        * Shared/efl/NativeWebWheelEventEfl.cpp: Added.
     21        (WebKit::NativeWebWheelEvent::NativeWebWheelEvent):
     22        * Shared/efl/WebEventFactory.cpp: Added.
     23        (WebKit::modifiersForEvent):
     24        (WebKit::buttonForEvent):
     25        (WebKit::clickCountForEvent):
     26        (WebKit::WebEventFactory::createWebMouseEvent):
     27        (WebKit::WebEventFactory::createWebWheelEvent):
     28        (WebKit::WebEventFactory::createWebKeyboardEvent):
     29        * Shared/efl/WebEventFactory.h: Added.
     30
    1312011-06-18  Eunmi Lee  <eunmi15.lee@samsung.com>
    232

  • trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h

    r79711 r89211  
    3939#include <GOwnPtrGtk.h>
    4040typedef union _GdkEvent GdkEvent;
     41#elif PLATFORM(EFL)
     42#include <Evas.h>
    4143#endif
    4244
    … …  
    5456    NativeWebKeyboardEvent(const NativeWebKeyboardEvent&);
    5557    NativeWebKeyboardEvent(GdkEvent*);
     58#elif PLATFORM(EFL)
     59    NativeWebKeyboardEvent(const Evas_Event_Key_Down*);
     60    NativeWebKeyboardEvent(const Evas_Event_Key_Up*);
    5661#endif
    5762
    … …  
    6469#elif PLATFORM(GTK)
    6570    const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
     71#elif PLATFORM(EFL)
     72    const void* nativeEvent() const { return m_nativeEvent; }
    6673#endif
    6774
    … …  
    7582#elif PLATFORM(GTK)
    7683    GOwnPtr<GdkEvent> m_nativeEvent;
     84#elif PLATFORM(EFL)
     85    const void* m_nativeEvent;
    7786#endif
    7887};

  • trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h

    r85856 r89211  
    3737#include <GOwnPtrGtk.h>
    3838typedef union _GdkEvent GdkEvent;
     39#elif PLATFORM(EFL)
     40#include <Evas.h>
    3941#endif
    4042
    … …  
    5254    NativeWebMouseEvent(const NativeWebMouseEvent&);
    5355    NativeWebMouseEvent(GdkEvent*, int);
     56#elif PLATFORM(EFL)
     57    NativeWebMouseEvent(const Evas_Event_Mouse_Down*, const Evas_Point*);
     58    NativeWebMouseEvent(const Evas_Event_Mouse_Up*, const Evas_Point*);
     59    NativeWebMouseEvent(const Evas_Event_Mouse_Move*, const Evas_Point*);
    5460#endif
    5561
    … …  
    6268#elif PLATFORM(GTK)
    6369    const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
     70#elif PLATFORM(EFL)
     71    const void* nativeEvent() const { return m_nativeEvent; }
    6472#endif
    6573
    … …  
    7381#elif PLATFORM(GTK)
    7482    GOwnPtr<GdkEvent> m_nativeEvent;
     83#elif PLATFORM(EFL)
     84    const void* m_nativeEvent;
    7585#endif
    7686};

  • trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h

    r85856 r89211  
    3737#include <GOwnPtrGtk.h>
    3838typedef union _GdkEvent GdkEvent;
     39#elif PLATFORM(EFL)
     40#include <Evas.h>
    3941#endif
    4042
    … …  
    5254    NativeWebWheelEvent(const NativeWebWheelEvent&);
    5355    NativeWebWheelEvent(GdkEvent*);
     56#elif PLATFORM(EFL)
     57    NativeWebWheelEvent(const Evas_Event_Mouse_Wheel*, const Evas_Point*);
    5458#endif
    5559
    … …  
    6266#elif PLATFORM(GTK)
    6367    const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
     68#elif PLATFORM(EFL)
     69    const Evas_Event_Mouse_Wheel* nativeEvent() const { return m_nativeEvent; }
    6470#endif
    6571
    … …  
    7379#elif PLATFORM(GTK)
    7480    GOwnPtr<GdkEvent> m_nativeEvent;
     81#elif PLATFORM(EFL)
     82    const Evas_Event_Mouse_Wheel* m_nativeEvent;
    7583#endif
    7684};

  • trunk/Source/WebKit2/Shared/efl/WebEventFactory.h

    r89210 r89211  
    11/*
    2  * Copyright (C) 2011 Apple Inc. All rights reserved.
     2 * Copyright (C) 2011 Samsung Electronics
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #ifndef NativeWebWheelEvent_h
    27 #define NativeWebWheelEvent_h
     26#ifndef WebEventFactory_h
     27#define WebEventFactory_h
    2828
    2929#include "WebEvent.h"
    30 
    31 #if PLATFORM(MAC)
    32 #include <wtf/RetainPtr.h>
    33 OBJC_CLASS NSView;
    34 #elif PLATFORM(QT)
    35 #include <qgraphicssceneevent.h>
    36 #elif PLATFORM(GTK)
    37 #include <GOwnPtrGtk.h>
    38 typedef union _GdkEvent GdkEvent;
    39 #endif
     30#include <Evas.h>
    4031
    4132namespace WebKit {
    4233
    43 class NativeWebWheelEvent : public WebWheelEvent {
     34class WebEventFactory {
    4435public:
    45 #if PLATFORM(MAC)
    46     NativeWebWheelEvent(NSEvent *, NSView *);
    47 #elif PLATFORM(WIN)
    48     NativeWebWheelEvent(HWND, UINT message, WPARAM, LPARAM);
    49 #elif PLATFORM(QT)
    50     explicit NativeWebWheelEvent(QGraphicsSceneWheelEvent*);
    51 #elif PLATFORM(GTK)
    52     NativeWebWheelEvent(const NativeWebWheelEvent&);
    53     NativeWebWheelEvent(GdkEvent*);
    54 #endif
    55 
    56 #if PLATFORM(MAC)
    57     NSEvent* nativeEvent() const { return m_nativeEvent.get(); }
    58 #elif PLATFORM(WIN)
    59     const MSG* nativeEvent() const { return &m_nativeEvent; }
    60 #elif PLATFORM(QT)
    61     const QGraphicsSceneWheelEvent* nativeEvent() const { return m_nativeEvent; }
    62 #elif PLATFORM(GTK)
    63     const GdkEvent* nativeEvent() const { return m_nativeEvent.get(); }
    64 #endif
    65 
    66 private:
    67 #if PLATFORM(MAC)
    68     RetainPtr<NSEvent> m_nativeEvent;
    69 #elif PLATFORM(WIN)
    70     MSG m_nativeEvent;
    71 #elif PLATFORM(QT)
    72     QGraphicsSceneWheelEvent* m_nativeEvent;
    73 #elif PLATFORM(GTK)
    74     GOwnPtr<GdkEvent> m_nativeEvent;
    75 #endif
     36    static WebMouseEvent createWebMouseEvent(const Evas_Event_Mouse_Down*, const Evas_Point*);
     37    static WebMouseEvent createWebMouseEvent(const Evas_Event_Mouse_Up*, const Evas_Point*);
     38    static WebMouseEvent createWebMouseEvent(const Evas_Event_Mouse_Move*, const Evas_Point*);
     39    static WebWheelEvent createWebWheelEvent(const Evas_Event_Mouse_Wheel*, const Evas_Point*);
     40    static WebKeyboardEvent createWebKeyboardEvent(const Evas_Event_Key_Down*);
     41    static WebKeyboardEvent createWebKeyboardEvent(const Evas_Event_Key_Up*);
    7642};
    7743
    7844} // namespace WebKit
    7945
    80 #endif // NativeWebWheelEvent_h
     46#endif // WebEventFactory_h
Note: See TracChangeset for help on using the changeset viewer.