Changeset 85168 in webkit


Ignore:
Timestamp:
Apr 27, 2011 11:46:04 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-27 Ryuan Choi <​ryuan.choi@samsung.com>

Reviewed by Antonio Gomes.

[EFL] Change cursor to LAZY_NATIVE_CURSOR
​https://bugs.webkit.org/show_bug.cgi?id=59411

Enable LAZY_NATIVE_CURSOR on EFL build.

No test added because functionality is unchanged.

  • CMakeListsEfl.txt: Add Cursor.cpp
  • platform/Cursor.h: (WebCore::Cursor::Cursor):
  • platform/efl/CursorEfl.cpp: (WebCore::Cursor::Cursor): (WebCore::Cursor::~Cursor): (WebCore::getCursorString): (WebCore::Cursor::ensurePlatformCursor):
  • platform/efl/WidgetEfl.cpp: (WebCore::Widget::setCursor):
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/CMakeListsEfl.txt

    r84088 r85168  
    2323  page/efl/EventHandlerEfl.cpp
    2424  page/efl/FrameEfl.cpp
     25  platform/Cursor.cpp
    2526  platform/efl/ClipboardEfl.cpp
    2627  platform/efl/ContextMenuEfl.cpp

  • trunk/Source/WebCore/ChangeLog

    r85166 r85168  
     12011-04-27  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Change cursor to LAZY_NATIVE_CURSOR
     6        https://bugs.webkit.org/show_bug.cgi?id=59411
     7
     8        Enable LAZY_NATIVE_CURSOR on EFL build.
     9
     10        No test added because functionality is unchanged.
     11
     12        * CMakeListsEfl.txt: Add Cursor.cpp
     13        * platform/Cursor.h:
     14        (WebCore::Cursor::Cursor):
     15        * platform/efl/CursorEfl.cpp:
     16        (WebCore::Cursor::Cursor):
     17        (WebCore::Cursor::~Cursor):
     18        (WebCore::getCursorString):
     19        (WebCore::Cursor::ensurePlatformCursor):
     20        * platform/efl/WidgetEfl.cpp:
     21        (WebCore::Widget::setCursor):
     22
    1232011-04-27  Adam Barth  <abarth@webkit.org>
    224

  • trunk/Source/WebCore/platform/Cursor.h

    r75009 r85168  
    6565#endif
    6666
    67 #if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT)
     67#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
    6868#define WTF_USE_LAZY_NATIVE_CURSOR 1
    6969#endif
    … …  
    155155
    156156        Cursor()
    157 #if !PLATFORM(EFL)
    158157            : m_platformCursor(0)
    159 #endif
    160158        {
    161159        }

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

    r63339 r85168  
    4444namespace WebCore {
    4545
    46 Cursor::Cursor(PlatformCursor p)
     46Cursor::Cursor(const Cursor& other)
     47    : m_type(other.m_type)
     48    , m_image(other.m_image)
     49    , m_hotSpot(other.m_hotSpot)
     50    , m_platformCursor(other.m_platformCursor)
    4751{
    48     m_platformCursor = eina_stringshare_add(p);
    49 }
    50 
    51 Cursor::Cursor(const Cursor& other)
    52 {
    53     m_platformCursor = eina_stringshare_ref(other.m_platformCursor);
    5452}
    5553
    5654Cursor::~Cursor()
    5755{
    58     if (m_platformCursor) {
    59         eina_stringshare_del(m_platformCursor);
    60         m_platformCursor = 0;
    61     }
    6256}
    6357
    64 Cursor::Cursor(Image* image, const IntPoint& hotspot)
    65     : m_platformCursor(0)
     58static const char* cursorString(Cursor::Type type)
    6659{
    67     notImplemented();
     60    static const char* cursorStrings[] = {
     61        "cursor/pointer",
     62        "cursor/cross",
     63        "cursor/hand",
     64        "cursor/i_beam",
     65        "cursor/wait",
     66        "cursor/help",
     67        "cursor/east_resize",
     68        "cursor/north_resize",
     69        "cursor/north_east_resize",
     70        "cursor/north_west_resize",
     71        "cursor/south_resize",
     72        "cursor/south_east_resize",
     73        "cursor/south_west_resize",
     74        "cursor/west_resize",
     75        "cursor/north_south_resize",
     76        "cursor/east_west_resize",
     77        "cursor/north_east_south_west_resize",
     78        "cursor/north_west_south_east_resize",
     79        "cursor/column_resize",
     80        "cursor/row_resize",
     81        "cursor/middle_panning",
     82        "cursor/east_panning",
     83        "cursor/north_panning",
     84        "cursor/north_east_panning",
     85        "cursor/north_west_panning",
     86        "cursor/south_panning",
     87        "cursor/south_east_panning",
     88        "cursor/south_west_panning",
     89        "cursor/west_panning",
     90        "cursor/move",
     91        "cursor/vertical_text",
     92        "cursor/cell",
     93        "cursor/context_menu",
     94        "cursor/alias",
     95        "cursor/progress",
     96        "cursor/no_drop",
     97        "cursor/copy",
     98        "cursor/none",
     99        "cursor/not_allowed",
     100        "cursor/zoom_in",
     101        "cursor/zoom_out",
     102        "cursor/grab",
     103        "cursor/grabbing",
     104        ""}; // FIXME: Just return "" for custom type. We don't support it now.
     105    return cursorStrings[type];
    68106}
    69107
    70 Cursor& Cursor::operator=(const Cursor& other)
     108void Cursor::ensurePlatformCursor() const
    71109{
    72     eina_stringshare_ref(other.m_platformCursor);
    73     eina_stringshare_del(m_platformCursor);
    74     m_platformCursor = other.m_platformCursor;
    75     return *this;
    76 }
    77 
    78 namespace {
    79 
    80 class Cursors {
    81 protected:
    82     Cursors()
    83         : PointerCursor("cursor/pointer")
    84         , MoveCursor("cursor/move")
    85         , CrossCursor("cursor/cross")
    86         , HandCursor("cursor/hand")
    87         , IBeamCursor("cursor/i_beam")
    88         , WaitCursor("cursor/wait")
    89         , HelpCursor("cursor/help")
    90         , EastResizeCursor("cursor/east_resize")
    91         , NorthResizeCursor("cursor/north_resize")
    92         , NorthEastResizeCursor("cursor/north_east_resize")
    93         , NorthWestResizeCursor("cursor/north_west_resize")
    94         , SouthResizeCursor("cursor/south_resize")
    95         , SouthEastResizeCursor("cursor/south_east_resize")
    96         , SouthWestResizeCursor("cursor/south_west_resize")
    97         , WestResizeCursor("cursor/west_resize")
    98         , NorthSouthResizeCursor("cursor/north_south_resize")
    99         , EastWestResizeCursor("cursor/east_west_resize")
    100         , NorthEastSouthWestResizeCursor("cursor/north_east_south_west_resize")
    101         , NorthWestSouthEastResizeCursor("cursor/north_west_south_east_resize")
    102         , ColumnResizeCursor("cursor/column_resize")
    103         , RowResizeCursor("cursor/row_resize")
    104         , MiddlePanningCursor("cursor/middle_panning")
    105         , EastPanningCursor("cursor/east_panning")
    106         , NorthPanningCursor("cursor/north_panning")
    107         , NorthEastPanningCursor("cursor/north_east_panning")
    108         , NorthWestPanningCursor("cursor/north_west_panning")
    109         , SouthPanningCursor("cursor/south_panning")
    110         , SouthEastPanningCursor("cursor/south_east_panning")
    111         , SouthWestPanningCursor("cursor/south_west_panning")
    112         , WestPanningCursor("cursor/west_panning")
    113         , VerticalTextCursor("cursor/vertical_text")
    114         , CellCursor("cursor/cell")
    115         , ContextMenuCursor("cursor/context_menu")
    116         , NoDropCursor("cursor/no_drop")
    117         , CopyCursor("cursor/copy")
    118         , ProgressCursor("cursor/progress")
    119         , AliasCursor("cursor/alias")
    120         , NoneCursor("cursor/none")
    121         , NotAllowedCursor("cursor/not_allowed")
    122         , ZoomInCursor("cursor/zoom_in")
    123         , ZoomOutCursor("cursor/zoom_out")
    124         , GrabCursor("cursor/grab")
    125         , GrabbingCursor("cursor/grabbing")
    126     {
    127     }
    128 
    129     ~Cursors()
    130     {
    131     }
    132 
    133 public:
    134     static Cursors* self();
    135     static Cursors* s_self;
    136 
    137     Cursor PointerCursor;
    138     Cursor MoveCursor;
    139     Cursor CrossCursor;
    140     Cursor HandCursor;
    141     Cursor IBeamCursor;
    142     Cursor WaitCursor;
    143     Cursor HelpCursor;
    144     Cursor EastResizeCursor;
    145     Cursor NorthResizeCursor;
    146     Cursor NorthEastResizeCursor;
    147     Cursor NorthWestResizeCursor;
    148     Cursor SouthResizeCursor;
    149     Cursor SouthEastResizeCursor;
    150     Cursor SouthWestResizeCursor;
    151     Cursor WestResizeCursor;
    152     Cursor NorthSouthResizeCursor;
    153     Cursor EastWestResizeCursor;
    154     Cursor NorthEastSouthWestResizeCursor;
    155     Cursor NorthWestSouthEastResizeCursor;
    156     Cursor ColumnResizeCursor;
    157     Cursor RowResizeCursor;
    158     Cursor MiddlePanningCursor;
    159     Cursor EastPanningCursor;
    160     Cursor NorthPanningCursor;
    161     Cursor NorthEastPanningCursor;
    162     Cursor NorthWestPanningCursor;
    163     Cursor SouthPanningCursor;
    164     Cursor SouthEastPanningCursor;
    165     Cursor SouthWestPanningCursor;
    166     Cursor WestPanningCursor;
    167     Cursor VerticalTextCursor;
    168     Cursor CellCursor;
    169     Cursor ContextMenuCursor;
    170     Cursor NoDropCursor;
    171     Cursor CopyCursor;
    172     Cursor ProgressCursor;
    173     Cursor AliasCursor;
    174     Cursor NoneCursor;
    175     Cursor NotAllowedCursor;
    176     Cursor ZoomInCursor;
    177     Cursor ZoomOutCursor;
    178     Cursor GrabCursor;
    179     Cursor GrabbingCursor;
    180 };
    181 
    182 Cursors* Cursors::s_self = 0;
    183 
    184 Cursors* Cursors::self()
    185 {
    186     if (!s_self)
    187         s_self = new Cursors();
    188 
    189     return s_self;
     110    if (m_platformCursor)
     111        return;
     112    m_platformCursor = cursorString(m_type);
    190113}
    191114
    192115}
    193 
    194 const Cursor& pointerCursor()
    195 {
    196     return Cursors::self()->PointerCursor;
    197 }
    198 
    199 const Cursor& moveCursor()
    200 {
    201     return Cursors::self()->MoveCursor;
    202 }
    203 
    204 const Cursor& crossCursor()
    205 {
    206     return Cursors::self()->CrossCursor;
    207 }
    208 
    209 const Cursor& handCursor()
    210 {
    211     return Cursors::self()->HandCursor;
    212 }
    213 
    214 const Cursor& iBeamCursor()
    215 {
    216     return Cursors::self()->IBeamCursor;
    217 }
    218 
    219 const Cursor& waitCursor()
    220 {
    221     return Cursors::self()->WaitCursor;
    222 }
    223 
    224 const Cursor& helpCursor()
    225 {
    226     return Cursors::self()->HelpCursor;
    227 }
    228 
    229 const Cursor& eastResizeCursor()
    230 {
    231     return Cursors::self()->EastResizeCursor;
    232 }
    233 
    234 const Cursor& northResizeCursor()
    235 {
    236     return Cursors::self()->NorthResizeCursor;
    237 }
    238 
    239 const Cursor& northEastResizeCursor()
    240 {
    241     return Cursors::self()->NorthEastResizeCursor;
    242 }
    243 
    244 const Cursor& northWestResizeCursor()
    245 {
    246     return Cursors::self()->NorthWestResizeCursor;
    247 }
    248 
    249 const Cursor& southResizeCursor()
    250 {
    251     return Cursors::self()->SouthResizeCursor;
    252 }
    253 
    254 const Cursor& southEastResizeCursor()
    255 {
    256     return Cursors::self()->SouthEastResizeCursor;
    257 }
    258 
    259 const Cursor& southWestResizeCursor()
    260 {
    261     return Cursors::self()->SouthWestResizeCursor;
    262 }
    263 
    264 const Cursor& westResizeCursor()
    265 {
    266     return Cursors::self()->WestResizeCursor;
    267 }
    268 
    269 const Cursor& northSouthResizeCursor()
    270 {
    271     return Cursors::self()->NorthSouthResizeCursor;
    272 }
    273 
    274 const Cursor& eastWestResizeCursor()
    275 {
    276     return Cursors::self()->EastWestResizeCursor;
    277 }
    278 
    279 const Cursor& northEastSouthWestResizeCursor()
    280 {
    281     return Cursors::self()->NorthEastSouthWestResizeCursor;
    282 }
    283 
    284 const Cursor& northWestSouthEastResizeCursor()
    285 {
    286     return Cursors::self()->NorthWestSouthEastResizeCursor;
    287 }
    288 
    289 const Cursor& columnResizeCursor()
    290 {
    291     return Cursors::self()->ColumnResizeCursor;
    292 }
    293 
    294 const Cursor& rowResizeCursor()
    295 {
    296     return Cursors::self()->RowResizeCursor;
    297 }
    298 
    299 const Cursor& middlePanningCursor()
    300 {
    301     return Cursors::self()->MiddlePanningCursor;
    302 }
    303 
    304 const Cursor& eastPanningCursor()
    305 {
    306     return Cursors::self()->EastPanningCursor;
    307 }
    308 
    309 const Cursor& northPanningCursor()
    310 {
    311     return Cursors::self()->NorthPanningCursor;
    312 }
    313 
    314 const Cursor& northEastPanningCursor()
    315 {
    316     return Cursors::self()->NorthEastPanningCursor;
    317 }
    318 
    319 const Cursor& northWestPanningCursor()
    320 {
    321     return Cursors::self()->NorthWestPanningCursor;
    322 }
    323 
    324 const Cursor& southPanningCursor()
    325 {
    326     return Cursors::self()->SouthPanningCursor;
    327 }
    328 
    329 const Cursor& southEastPanningCursor()
    330 {
    331     return Cursors::self()->SouthEastPanningCursor;
    332 }
    333 
    334 const Cursor& southWestPanningCursor()
    335 {
    336     return Cursors::self()->SouthWestPanningCursor;
    337 }
    338 
    339 const Cursor& westPanningCursor()
    340 {
    341     return Cursors::self()->WestPanningCursor;
    342 }
    343 
    344 const Cursor& verticalTextCursor()
    345 {
    346     return Cursors::self()->VerticalTextCursor;
    347 }
    348 
    349 const Cursor& cellCursor()
    350 {
    351     return Cursors::self()->CellCursor;
    352 }
    353 
    354 const Cursor& contextMenuCursor()
    355 {
    356     return Cursors::self()->ContextMenuCursor;
    357 }
    358 
    359 const Cursor& noDropCursor()
    360 {
    361     return Cursors::self()->NoDropCursor;
    362 }
    363 
    364 const Cursor& copyCursor()
    365 {
    366     return Cursors::self()->CopyCursor;
    367 }
    368 
    369 const Cursor& progressCursor()
    370 {
    371     return Cursors::self()->ProgressCursor;
    372 }
    373 
    374 const Cursor& aliasCursor()
    375 {
    376     return Cursors::self()->AliasCursor;
    377 }
    378 
    379 const Cursor& noneCursor()
    380 {
    381     return Cursors::self()->NoneCursor;
    382 }
    383 
    384 const Cursor& notAllowedCursor()
    385 {
    386     return Cursors::self()->NotAllowedCursor;
    387 }
    388 
    389 const Cursor& zoomInCursor()
    390 {
    391     return Cursors::self()->ZoomInCursor;
    392 }
    393 
    394 const Cursor& zoomOutCursor()
    395 {
    396     return Cursors::self()->ZoomOutCursor;
    397 }
    398 
    399 const Cursor& grabCursor()
    400 {
    401     return Cursors::self()->GrabCursor;
    402 }
    403 
    404 const Cursor& grabbingCursor()
    405 {
    406     return Cursors::self()->GrabbingCursor;
    407 }
    408 
    409 }

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

    r80543 r85168  
    264264         return;
    265265
    266     const char *group = cursor.impl();
     266    const char* group = cursor.platformCursor();
    267267    if (!group || String(group) == m_data->m_cursorGroup)
    268268        return;
Note: See TracChangeset for help on using the changeset viewer.