Changeset 80543 in webkit


Ignore:
Timestamp:
Mar 7, 2011 11:33:34 PM (13 years ago)
Author:
gyuyoung.kim@samsung.com
Message:

2011-03-07 Gyuyoung Kim <​gyuyoung.kim@samsung.com>

Reviewed by Kent Tamura.

[EFL] Adjust functions of WebCore's efl port to WebKit coding style
​https://bugs.webkit.org/show_bug.cgi?id=55924

Adjust webkit style to PlatformKeyboardEventEfl, PlatformMouseEventEfl and WidgetEfl files.

  • platform/efl/PlatformKeyboardEventEfl.cpp: (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
  • platform/efl/PlatformMouseEventEfl.cpp: (WebCore::PlatformMouseEvent::PlatformMouseEvent):
  • platform/efl/WidgetEfl.cpp: (WebCore::Widget::frameRectsChanged): (WebCore::Widget::setEvasObject):
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80541 r80543  
     12011-03-07  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
     2
     3        Reviewed by Kent Tamura.
     4
     5        [EFL] Adjust functions of WebCore's efl port to WebKit coding style
     6        https://bugs.webkit.org/show_bug.cgi?id=55924
     7
     8        Adjust webkit style to PlatformKeyboardEventEfl, PlatformMouseEventEfl and WidgetEfl files.
     9
     10        * platform/efl/PlatformKeyboardEventEfl.cpp:
     11        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
     12        * platform/efl/PlatformMouseEventEfl.cpp:
     13        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
     14        * platform/efl/WidgetEfl.cpp:
     15        (WebCore::Widget::frameRectsChanged):
     16        (WebCore::Widget::setEvasObject):
     17
    1182011-03-07  Daniel Cheng  <dcheng@chromium.org>
    219

  • trunk/Source/WebCore/platform/efl/PlatformKeyboardEventEfl.cpp

    r69849 r80543  
    189189}
    190190
    191 PlatformKeyboardEvent::PlatformKeyboardEvent(const Evas_Event_Key_Down* ev)
     191PlatformKeyboardEvent::PlatformKeyboardEvent(const Evas_Event_Key_Down* event)
    192192    : m_type(KeyDown)
    193     , m_text(String::fromUTF8(ev->string))
    194     , m_shiftKey(evas_key_modifier_is_set(ev->modifiers, "Shift"))
    195     , m_ctrlKey(evas_key_modifier_is_set(ev->modifiers, "Control"))
    196     , m_altKey(evas_key_modifier_is_set(ev->modifiers, "Alt"))
    197     , m_metaKey(evas_key_modifier_is_set(ev->modifiers, "Meta"))
    198 {
    199     String keyName = String(ev->key);
     193    , m_text(String::fromUTF8(event->string))
     194    , m_shiftKey(evas_key_modifier_is_set(event->modifiers, "Shift"))
     195    , m_ctrlKey(evas_key_modifier_is_set(event->modifiers, "Control"))
     196    , m_altKey(evas_key_modifier_is_set(event->modifiers, "Alt"))
     197    , m_metaKey(evas_key_modifier_is_set(event->modifiers, "Meta"))
     198{
     199    String keyName = String(event->key);
    200200    m_keyIdentifier = keyIdentifierForEvasKeyName(keyName);
    201201    m_windowsVirtualKeyCode = windowsKeyCodeForEvasKeyName(keyName);
    … …  
    206206}
    207207
    208 PlatformKeyboardEvent::PlatformKeyboardEvent(const Evas_Event_Key_Up* ev)
     208PlatformKeyboardEvent::PlatformKeyboardEvent(const Evas_Event_Key_Up* event)
    209209    : m_type(KeyUp)
    210     , m_text(String::fromUTF8(ev->string))
    211     , m_shiftKey(evas_key_modifier_is_set(ev->modifiers, "Shift"))
    212     , m_ctrlKey(evas_key_modifier_is_set(ev->modifiers, "Control"))
    213     , m_altKey(evas_key_modifier_is_set(ev->modifiers, "Alt"))
    214     , m_metaKey(evas_key_modifier_is_set(ev->modifiers, "Meta"))
    215 {
    216     String keyName = String(ev->key);
     210    , m_text(String::fromUTF8(event->string))
     211    , m_shiftKey(evas_key_modifier_is_set(event->modifiers, "Shift"))
     212    , m_ctrlKey(evas_key_modifier_is_set(event->modifiers, "Control"))
     213    , m_altKey(evas_key_modifier_is_set(event->modifiers, "Alt"))
     214    , m_metaKey(evas_key_modifier_is_set(event->modifiers, "Meta"))
     215{
     216    String keyName = String(event->key);
    217217    m_keyIdentifier = keyIdentifierForEvasKeyName(keyName);
    218218    m_windowsVirtualKeyCode = windowsKeyCodeForEvasKeyName(keyName);

  • trunk/Source/WebCore/platform/efl/PlatformMouseEventEfl.cpp

    r61331 r80543  
    4848}
    4949
    50 PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Down* ev, IntPoint pos)
    51     : m_position(IntPoint(ev->canvas.x - pos.x(), ev->canvas.y - pos.y()))
    52     , m_globalPosition(IntPoint(ev->canvas.x, ev->canvas.y))
    53     , m_button(MouseButton(ev->button - 1))
     50PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Down* event, IntPoint position)
     51    : m_position(IntPoint(event->canvas.x - position.x(), event->canvas.y - position.y()))
     52    , m_globalPosition(IntPoint(event->canvas.x, event->canvas.y))
     53    , m_button(MouseButton(event->button - 1))
    5454    , m_eventType(MouseEventPressed)
    55     , m_shiftKey(evas_key_modifier_is_set(ev->modifiers, "Shift"))
    56     , m_ctrlKey(evas_key_modifier_is_set(ev->modifiers, "Control"))
    57     , m_altKey(evas_key_modifier_is_set(ev->modifiers, "Alt"))
    58     , m_metaKey(evas_key_modifier_is_set(ev->modifiers, "Meta"))
     55    , m_shiftKey(evas_key_modifier_is_set(event->modifiers, "Shift"))
     56    , m_ctrlKey(evas_key_modifier_is_set(event->modifiers, "Control"))
     57    , m_altKey(evas_key_modifier_is_set(event->modifiers, "Alt"))
     58    , m_metaKey(evas_key_modifier_is_set(event->modifiers, "Meta"))
    5959    , m_timestamp(currentTime())
    6060{
    61     setClickCount(ev->flags);
     61    setClickCount(event->flags);
    6262}
    6363
    64 PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Up* ev, IntPoint pos)
    65     : m_position(IntPoint(ev->canvas.x - pos.x(), ev->canvas.y - pos.y()))
    66     , m_globalPosition(IntPoint(ev->canvas.x, ev->canvas.y))
    67     , m_button(MouseButton(ev->button - 1))
     64PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Up* event, IntPoint position)
     65    : m_position(IntPoint(event->canvas.x - position.x(), event->canvas.y - position.y()))
     66    , m_globalPosition(IntPoint(event->canvas.x, event->canvas.y))
     67    , m_button(MouseButton(event->button - 1))
    6868    , m_eventType(MouseEventReleased)
    69     , m_shiftKey(evas_key_modifier_is_set(ev->modifiers, "Shift"))
    70     , m_ctrlKey(evas_key_modifier_is_set(ev->modifiers, "Control"))
    71     , m_altKey(evas_key_modifier_is_set(ev->modifiers, "Alt"))
    72     , m_metaKey(evas_key_modifier_is_set(ev->modifiers, "Meta"))
     69    , m_shiftKey(evas_key_modifier_is_set(event->modifiers, "Shift"))
     70    , m_ctrlKey(evas_key_modifier_is_set(event->modifiers, "Control"))
     71    , m_altKey(evas_key_modifier_is_set(event->modifiers, "Alt"))
     72    , m_metaKey(evas_key_modifier_is_set(event->modifiers, "Meta"))
    7373    , m_timestamp(currentTime())
    7474{
    75     setClickCount(ev->flags);
     75    setClickCount(event->flags);
    7676}
    7777
    78 PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Move* ev, IntPoint pos)
    79     : m_position(IntPoint(ev->cur.canvas.x - pos.x(), ev->cur.canvas.y - pos.y()))
    80     , m_globalPosition(IntPoint(ev->cur.canvas.x, ev->cur.canvas.y))
    81     , m_button(MouseButton(ev->buttons - 1))
     78PlatformMouseEvent::PlatformMouseEvent(const Evas_Event_Mouse_Move* event, IntPoint position)
     79    : m_position(IntPoint(event->cur.canvas.x - position.x(), event->cur.canvas.y - position.y()))
     80    , m_globalPosition(IntPoint(event->cur.canvas.x, event->cur.canvas.y))
     81    , m_button(MouseButton(event->buttons - 1))
    8282    , m_eventType(MouseEventMoved)
    8383    , m_clickCount(0)
    84     , m_shiftKey(evas_key_modifier_is_set(ev->modifiers, "Shift"))
    85     , m_ctrlKey(evas_key_modifier_is_set(ev->modifiers, "Control"))
    86     , m_altKey(evas_key_modifier_is_set(ev->modifiers, "Alt"))
    87     , m_metaKey(evas_key_modifier_is_set(ev->modifiers, "Meta"))
     84    , m_shiftKey(evas_key_modifier_is_set(event->modifiers, "Shift"))
     85    , m_ctrlKey(evas_key_modifier_is_set(event->modifiers, "Control"))
     86    , m_altKey(evas_key_modifier_is_set(event->modifiers, "Alt"))
     87    , m_metaKey(evas_key_modifier_is_set(event->modifiers, "Meta"))
    8888    , m_timestamp(currentTime())
    8989{

  • trunk/Source/WebCore/platform/efl/WidgetEfl.cpp

    r70051 r80543  
    184184void Widget::frameRectsChanged()
    185185{
    186     Evas_Object* o = evasObject();
     186    Evas_Object* object = evasObject();
    187187    Evas_Coord x, y;
    188188
    189     if (!parent() || !o)
     189    if (!parent() || !object)
    190190        return;
    191191
    … …  
    197197
    198198    evas_object_geometry_get(root()->evasObject(), &x, &y, 0, 0);
    199     evas_object_move(o, x + rect.x(), y + rect.y());
    200     evas_object_resize(o, rect.width(), rect.height());
     199    evas_object_move(object, x + rect.x(), y + rect.y());
     200    evas_object_resize(object, rect.width(), rect.height());
    201201}
    202202
    … …  
    333333}
    334334
    335 void Widget::setEvasObject(Evas_Object *o)
     335void Widget::setEvasObject(Evas_Object *object)
    336336{
    337337    // FIXME: study platformWidget() and use it
    338338    // FIXME: right now platformWidget() requires implementing too much
    339     if (m_data->m_evasObject == o)
    340         return;
    341     m_data->m_evasObject = o;
    342     if (!o) {
     339    if (m_data->m_evasObject == object)
     340        return;
     341    m_data->m_evasObject = object;
     342    if (!object) {
    343343        m_data->m_evas = 0;
    344344#ifdef HAVE_ECORE_X
    … …  
    348348    }
    349349
    350     m_data->m_evas = evas_object_evas_get(o);
     350    m_data->m_evas = evas_object_evas_get(object);
    351351
    352352#ifdef HAVE_ECORE_X
Note: See TracChangeset for help on using the changeset viewer.