Changeset 134149 in webkit


Ignore:
Timestamp:
Nov 9, 2012 9:12:55 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Source/WebCore: Move chromium to USE(LAZY_NATIVE_CURSOR)
https://bugs.webkit.org/show_bug.cgi?id=101501

Patch by Rick Byers <rbyers@chromium.org> on 2012-11-09
Reviewed by Adam Barth.

This simplifies cursor handling in chromium and unifies it with other
ports for easier code sharing and testing by moving to the
USE_LAZY_CURSOR model and eliminating PlatformCursor entirely.

PlatformCursor adds no value in chromium since the sandboxing model
requires the cursor information be marshalled to the browser process
before being turned into a real OS cursor.

Test: fast/events/mouse-cursor.html

  • WebCore.gypi:
  • platform/Cursor.h:

(WebCore):

  • platform/chromium/CursorChromium.cpp:

(WebCore::Cursor::Cursor):
(WebCore::Cursor::operator=):
(WebCore::Cursor::~Cursor):
(WebCore::Cursor::ensurePlatformCursor):

  • platform/chromium/PlatformCursor.h: Removed.

Source/WebKit/chromium: Move chromium to USE(LAZY_NATIVE_CURSOR)
https://bugs.webkit.org/show_bug.cgi?id=101501

Patch by Rick Byers <rbyers@chromium.org> on 2012-11-09
Reviewed by Adam Barth.

Update conversion from Cursor to WebCursorInfo to remove the
intermediate (and useless) step of PlatformCursor.

  • src/AssertMatchingEnums.cpp:
  • src/WebCursorInfo.cpp:

(WebKit::WebCursorInfo::WebCursorInfo):

LayoutTests: [chromium] Move to USE(LAZY_NATIVE_CURSOR)
https://bugs.webkit.org/show_bug.cgi?id=101501

Patch by Rick Byers <rbyers@chromium.org> on 2012-11-09
Reviewed by Adam Barth.

Remove failure expectation for fast/events/mouse-cursor.html now that
chromium uses the same cursor architecture as other ports.

  • platform/chromium/TestExpectations:
Location:
trunk
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r134144 r134149  
     12012-11-09  Rick Byers  <rbyers@chromium.org>
     2
     3        [chromium] Move to USE(LAZY_NATIVE_CURSOR)
     4        https://bugs.webkit.org/show_bug.cgi?id=101501
     5
     6        Reviewed by Adam Barth.
     7
     8        Remove failure expectation for fast/events/mouse-cursor.html now that
     9        chromium uses the same cursor architecture as other ports.
     10
     11        * platform/chromium/TestExpectations:
     12
    1132012-11-09  Rick Byers  <rbyers@chromium.org>
    214
  • trunk/LayoutTests/platform/chromium/TestExpectations

    r134144 r134149  
    42034203webkit.org/b/101618 [ Win7 Debug ] http/tests/inspector/indexeddb/database-data.html [ Crash ]
    42044204
    4205 # This test will be enabled shortly when chromium moves to the USE(LAZY_NATIVE_CURSOR) infrastructure
    4206 webkit.org/b/101501 fast/events/mouse-cursor.html [ Failure ]
    4207 
    42084205# Failures following r133840:
    42094206webkit.org/b/101547 fast/repaint/4774354.html [ ImageOnlyFailure ]
  • trunk/Source/WebCore/ChangeLog

    r134147 r134149  
     12012-11-09  Rick Byers  <rbyers@chromium.org>
     2
     3        Move chromium to USE(LAZY_NATIVE_CURSOR)
     4        https://bugs.webkit.org/show_bug.cgi?id=101501
     5
     6        Reviewed by Adam Barth.
     7
     8        This simplifies cursor handling in chromium and unifies it with other
     9        ports for easier code sharing and testing by moving to the
     10        USE_LAZY_CURSOR model and eliminating PlatformCursor entirely.
     11
     12        PlatformCursor adds no value in chromium since the sandboxing model
     13        requires the cursor information be marshalled to the browser process
     14        before being turned into a real OS cursor.
     15
     16        Test: fast/events/mouse-cursor.html
     17
     18        * WebCore.gypi:
     19        * platform/Cursor.h:
     20        (WebCore):
     21        * platform/chromium/CursorChromium.cpp:
     22        (WebCore::Cursor::Cursor):
     23        (WebCore::Cursor::operator=):
     24        (WebCore::Cursor::~Cursor):
     25        (WebCore::Cursor::ensurePlatformCursor):
     26        * platform/chromium/PlatformCursor.h: Removed.
     27
    1282012-11-09  Noam Rosenthal  <noam.rosenthal@nokia.com>
    229
  • trunk/Source/WebCore/WebCore.gypi

    r134120 r134149  
    46724672            'platform/chromium/PageClientChromium.h',
    46734673            'platform/chromium/PasteboardChromium.cpp',
    4674             'platform/chromium/PlatformCursor.h',
    46754674            'platform/chromium/PlatformKeyboardEventChromium.cpp',
    46764675            'platform/chromium/PlatformScreenChromium.cpp',
  • trunk/Source/WebCore/platform/Cursor.h

    r128572 r134149  
    4242#elif PLATFORM(QT)
    4343#include <QCursor>
    44 #elif PLATFORM(CHROMIUM)
    45 #include "PlatformCursor.h"
    4644#elif PLATFORM(BLACKBERRY)
    4745#include <BlackBerryPlatformCursor.h>
     
    6159#endif
    6260
    63 #if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL)
     61// Looks like it's just PLATFORM(WX) and PLATFORM(BLACKBERRY) still not using this?
     62#if PLATFORM(WIN) || PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(CHROMIUM)
    6463#define WTF_USE_LAZY_NATIVE_CURSOR 1
    6564#endif
     
    9190#elif PLATFORM(WX)
    9291    typedef wxCursor* PlatformCursor;
    93 #elif PLATFORM(CHROMIUM)
    94     // See PlatformCursor.h
    9592#elif PLATFORM(BLACKBERRY)
    9693    typedef BlackBerry::Platform::BlackBerryCursor PlatformCursor;
  • trunk/Source/WebCore/platform/chromium/CursorChromium.cpp

    r99293 r134149  
    3737
    3838Cursor::Cursor(const Cursor& other)
    39     : m_platformCursor(other.m_platformCursor)
     39    : m_type(other.m_type)
     40    , m_image(other.m_image)
     41    , m_hotSpot(other.m_hotSpot)
     42    , m_platformCursor(other.m_platformCursor)
    4043{
    4144}
    4245
    43 Cursor::Cursor(Image* image, const IntPoint& hotSpot)
    44     : m_platformCursor(image, hotSpot)
     46Cursor& Cursor::operator=(const Cursor& other)
    4547{
     48    m_type = other.m_type;
     49    m_image = other.m_image;
     50    m_hotSpot = other.m_hotSpot;
     51    m_platformCursor = other.m_platformCursor;
     52    return *this;
    4653}
    4754
     
    5057}
    5158
    52 Cursor& Cursor::operator=(const Cursor& other)
     59void Cursor::ensurePlatformCursor() const
    5360{
    54     m_platformCursor = other.m_platformCursor;
    55     return *this;
    56 }
    57 
    58 Cursor::Cursor(PlatformCursor c)
    59     : m_platformCursor(c)
    60 {
    61 }
    62 
    63 const Cursor& pointerCursor()
    64 {
    65     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypePointer));
    66     return c;
    67 }
    68 
    69 const Cursor& crossCursor()
    70 {
    71     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCross));
    72     return c;
    73 }
    74 
    75 const Cursor& handCursor()
    76 {
    77     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHand));
    78     return c;
    79 }
    80 
    81 const Cursor& iBeamCursor()
    82 {
    83     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeIBeam));
    84     return c;
    85 }
    86 
    87 const Cursor& waitCursor()
    88 {
    89     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWait));
    90     return c;
    91 }
    92 
    93 const Cursor& helpCursor()
    94 {
    95     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeHelp));
    96     return c;
    97 }
    98 
    99 const Cursor& eastResizeCursor()
    100 {
    101     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastResize));
    102     return c;
    103 }
    104 
    105 const Cursor& northResizeCursor()
    106 {
    107     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthResize));
    108     return c;
    109 }
    110 
    111 const Cursor& northEastResizeCursor()
    112 {
    113     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastResize));
    114     return c;
    115 }
    116 
    117 const Cursor& northWestResizeCursor()
    118 {
    119     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestResize));
    120     return c;
    121 }
    122 
    123 const Cursor& southResizeCursor()
    124 {
    125     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthResize));
    126     return c;
    127 }
    128 
    129 const Cursor& southEastResizeCursor()
    130 {
    131     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastResize));
    132     return c;
    133 }
    134 
    135 const Cursor& southWestResizeCursor()
    136 {
    137     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestResize));
    138     return c;
    139 }
    140 
    141 const Cursor& westResizeCursor()
    142 {
    143     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestResize));
    144     return c;
    145 }
    146 
    147 const Cursor& northSouthResizeCursor()
    148 {
    149     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthSouthResize));
    150     return c;
    151 }
    152 
    153 const Cursor& eastWestResizeCursor()
    154 {
    155     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastWestResize));
    156     return c;
    157 }
    158 
    159 const Cursor& northEastSouthWestResizeCursor()
    160 {
    161     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastSouthWestResize));
    162     return c;
    163 }
    164 
    165 const Cursor& northWestSouthEastResizeCursor()
    166 {
    167     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestSouthEastResize));
    168     return c;
    169 }
    170 
    171 const Cursor& columnResizeCursor()
    172 {
    173     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeColumnResize));
    174     return c;
    175 }
    176 
    177 const Cursor& rowResizeCursor()
    178 {
    179     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeRowResize));
    180     return c;
    181 }
    182 
    183 const Cursor& middlePanningCursor()
    184 {
    185     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMiddlePanning));
    186     return c;
    187 }
    188 
    189 const Cursor& eastPanningCursor()
    190 {
    191     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeEastPanning));
    192     return c;
    193 }
    194 
    195 const Cursor& northPanningCursor()
    196 {
    197     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthPanning));
    198     return c;
    199 }
    200 
    201 const Cursor& northEastPanningCursor()
    202 {
    203     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthEastPanning));
    204     return c;
    205 }
    206 
    207 const Cursor& northWestPanningCursor()
    208 {
    209     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNorthWestPanning));
    210     return c;
    211 }
    212 
    213 const Cursor& southPanningCursor()
    214 {
    215     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthPanning));
    216     return c;
    217 }
    218 
    219 const Cursor& southEastPanningCursor()
    220 {
    221     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthEastPanning));
    222     return c;
    223 }
    224 
    225 const Cursor& southWestPanningCursor()
    226 {
    227     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeSouthWestPanning));
    228     return c;
    229 }
    230 
    231 const Cursor& westPanningCursor()
    232 {
    233     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeWestPanning));
    234     return c;
    235 }
    236 
    237 const Cursor& moveCursor()
    238 {
    239     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeMove));
    240     return c;
    241 }
    242 
    243 const Cursor& verticalTextCursor()
    244 {
    245     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeVerticalText));
    246     return c;
    247 }
    248 
    249 const Cursor& cellCursor()
    250 {
    251     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCell));
    252     return c;
    253 }
    254 
    255 const Cursor& contextMenuCursor()
    256 {
    257     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeContextMenu));
    258     return c;
    259 }
    260 
    261 const Cursor& aliasCursor()
    262 {
    263     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeAlias));
    264     return c;
    265 }
    266 
    267 const Cursor& progressCursor()
    268 {
    269     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeProgress));
    270     return c;
    271 }
    272 
    273 const Cursor& noDropCursor()
    274 {
    275     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNoDrop));
    276     return c;
    277 }
    278 
    279 const Cursor& copyCursor()
    280 {
    281     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeCopy));
    282     return c;
    283 }
    284 
    285 const Cursor& noneCursor()
    286 {
    287     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNone));
    288     return c;
    289 }
    290 
    291 const Cursor& notAllowedCursor()
    292 {
    293     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeNotAllowed));
    294     return c;
    295 }
    296 
    297 const Cursor& zoomInCursor()
    298 {
    299     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomIn));
    300     return c;
    301 }
    302 
    303 const Cursor& zoomOutCursor()
    304 {
    305     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeZoomOut));
    306     return c;
    307 }
    308 
    309 const Cursor& grabCursor()
    310 {
    311     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrab));
    312     return c;
    313 }
    314 
    315 const Cursor& grabbingCursor()
    316 {
    317     DEFINE_STATIC_LOCAL(Cursor, c, (PlatformCursor::TypeGrabbing));
    318     return c;
     61    // Chromium has no PlatformCursor.
     62    UNREACHABLE_FOR_PLATFORM();
    31963}
    32064
    32165} // namespace WebCore
    322 
    323 #define COMPILE_ASSERT_MATCHING_ENUM(cursor_name, platform_cursor_name) \
    324     COMPILE_ASSERT(int(WebCore::Cursor::cursor_name) == int(WebCore::PlatformCursor::platform_cursor_name), mismatching_enums)
    325 
    326 COMPILE_ASSERT_MATCHING_ENUM(Pointer, TypePointer);
    327 COMPILE_ASSERT_MATCHING_ENUM(Cross, TypeCross);
    328 COMPILE_ASSERT_MATCHING_ENUM(Hand, TypeHand);
    329 COMPILE_ASSERT_MATCHING_ENUM(IBeam, TypeIBeam);
    330 COMPILE_ASSERT_MATCHING_ENUM(Wait, TypeWait);
    331 COMPILE_ASSERT_MATCHING_ENUM(Help, TypeHelp);
    332 COMPILE_ASSERT_MATCHING_ENUM(EastResize, TypeEastResize);
    333 COMPILE_ASSERT_MATCHING_ENUM(NorthResize, TypeNorthResize);
    334 COMPILE_ASSERT_MATCHING_ENUM(NorthEastResize, TypeNorthEastResize);
    335 COMPILE_ASSERT_MATCHING_ENUM(NorthWestResize, TypeNorthWestResize);
    336 COMPILE_ASSERT_MATCHING_ENUM(SouthResize, TypeSouthResize);
    337 COMPILE_ASSERT_MATCHING_ENUM(SouthEastResize, TypeSouthEastResize);
    338 COMPILE_ASSERT_MATCHING_ENUM(SouthWestResize, TypeSouthWestResize);
    339 COMPILE_ASSERT_MATCHING_ENUM(WestResize, TypeWestResize);
    340 COMPILE_ASSERT_MATCHING_ENUM(NorthSouthResize, TypeNorthSouthResize);
    341 COMPILE_ASSERT_MATCHING_ENUM(EastWestResize, TypeEastWestResize);
    342 COMPILE_ASSERT_MATCHING_ENUM(NorthEastSouthWestResize, TypeNorthEastSouthWestResize);
    343 COMPILE_ASSERT_MATCHING_ENUM(NorthWestSouthEastResize, TypeNorthWestSouthEastResize);
    344 COMPILE_ASSERT_MATCHING_ENUM(ColumnResize, TypeColumnResize);
    345 COMPILE_ASSERT_MATCHING_ENUM(RowResize, TypeRowResize);
    346 COMPILE_ASSERT_MATCHING_ENUM(MiddlePanning, TypeMiddlePanning);
    347 COMPILE_ASSERT_MATCHING_ENUM(EastPanning, TypeEastPanning);
    348 COMPILE_ASSERT_MATCHING_ENUM(NorthPanning, TypeNorthPanning);
    349 COMPILE_ASSERT_MATCHING_ENUM(NorthEastPanning, TypeNorthEastPanning);
    350 COMPILE_ASSERT_MATCHING_ENUM(NorthWestPanning, TypeNorthWestPanning);
    351 COMPILE_ASSERT_MATCHING_ENUM(SouthPanning, TypeSouthPanning);
    352 COMPILE_ASSERT_MATCHING_ENUM(SouthEastPanning, TypeSouthEastPanning);
    353 COMPILE_ASSERT_MATCHING_ENUM(SouthWestPanning, TypeSouthWestPanning);
    354 COMPILE_ASSERT_MATCHING_ENUM(WestPanning, TypeWestPanning);
    355 COMPILE_ASSERT_MATCHING_ENUM(Move, TypeMove);
    356 COMPILE_ASSERT_MATCHING_ENUM(VerticalText, TypeVerticalText);
    357 COMPILE_ASSERT_MATCHING_ENUM(Cell, TypeCell);
    358 COMPILE_ASSERT_MATCHING_ENUM(ContextMenu, TypeContextMenu);
    359 COMPILE_ASSERT_MATCHING_ENUM(Alias, TypeAlias);
    360 COMPILE_ASSERT_MATCHING_ENUM(Progress, TypeProgress);
    361 COMPILE_ASSERT_MATCHING_ENUM(NoDrop, TypeNoDrop);
    362 COMPILE_ASSERT_MATCHING_ENUM(Copy, TypeCopy);
    363 COMPILE_ASSERT_MATCHING_ENUM(None, TypeNone);
    364 COMPILE_ASSERT_MATCHING_ENUM(NotAllowed, TypeNotAllowed);
    365 COMPILE_ASSERT_MATCHING_ENUM(ZoomIn, TypeZoomIn);
    366 COMPILE_ASSERT_MATCHING_ENUM(ZoomOut, TypeZoomOut);
    367 COMPILE_ASSERT_MATCHING_ENUM(Grab, TypeGrab);
    368 COMPILE_ASSERT_MATCHING_ENUM(Grabbing, TypeGrabbing);
    369 COMPILE_ASSERT_MATCHING_ENUM(Custom, TypeCustom);
  • trunk/Source/WebKit/chromium/ChangeLog

    r134129 r134149  
     12012-11-09  Rick Byers  <rbyers@chromium.org>
     2
     3        Move chromium to USE(LAZY_NATIVE_CURSOR)
     4        https://bugs.webkit.org/show_bug.cgi?id=101501
     5
     6        Reviewed by Adam Barth.
     7
     8        Update conversion from Cursor to WebCursorInfo to remove the
     9        intermediate (and useless) step of PlatformCursor.
     10
     11        * src/AssertMatchingEnums.cpp:
     12        * src/WebCursorInfo.cpp:
     13        (WebKit::WebCursorInfo::WebCursorInfo):
     14
    1152012-11-09  Alec Flett  <alecflett@chromium.org>
    216
  • trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp

    r134084 r134149  
    3838#include "ApplicationCacheHost.h"
    3939#include "ContentSecurityPolicy.h"
     40#include "Cursor.h"
    4041#include "DocumentMarker.h"
    4142#include "EditorInsertAction.h"
     
    6566#include "NotificationClient.h"
    6667#include "PageVisibilityState.h"
    67 #include "PlatformCursor.h"
    6868#include "RTCDataChannelDescriptor.h"
    6969#include "RTCPeerConnectionHandlerClient.h"
     
    281281COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::ObsoleteEvent, ApplicationCacheHost::OBSOLETE_EVENT);
    282282
    283 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, PlatformCursor::TypePointer);
    284 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, PlatformCursor::TypeCross);
    285 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, PlatformCursor::TypeHand);
    286 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, PlatformCursor::TypeIBeam);
    287 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, PlatformCursor::TypeWait);
    288 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, PlatformCursor::TypeHelp);
    289 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, PlatformCursor::TypeEastResize);
    290 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, PlatformCursor::TypeNorthResize);
    291 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, PlatformCursor::TypeNorthEastResize);
    292 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, PlatformCursor::TypeNorthWestResize);
    293 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, PlatformCursor::TypeSouthResize);
    294 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, PlatformCursor::TypeSouthEastResize);
    295 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, PlatformCursor::TypeSouthWestResize);
    296 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, PlatformCursor::TypeWestResize);
    297 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, PlatformCursor::TypeNorthSouthResize);
    298 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, PlatformCursor::TypeEastWestResize);
    299 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, PlatformCursor::TypeNorthEastSouthWestResize);
    300 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, PlatformCursor::TypeNorthWestSouthEastResize);
    301 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, PlatformCursor::TypeColumnResize);
    302 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, PlatformCursor::TypeRowResize);
    303 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, PlatformCursor::TypeMiddlePanning);
    304 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, PlatformCursor::TypeEastPanning);
    305 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, PlatformCursor::TypeNorthPanning);
    306 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, PlatformCursor::TypeNorthEastPanning);
    307 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, PlatformCursor::TypeNorthWestPanning);
    308 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, PlatformCursor::TypeSouthPanning);
    309 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, PlatformCursor::TypeSouthEastPanning);
    310 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, PlatformCursor::TypeSouthWestPanning);
    311 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, PlatformCursor::TypeWestPanning);
    312 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, PlatformCursor::TypeMove);
    313 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, PlatformCursor::TypeVerticalText);
    314 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, PlatformCursor::TypeCell);
    315 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, PlatformCursor::TypeContextMenu);
    316 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, PlatformCursor::TypeAlias);
    317 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, PlatformCursor::TypeProgress);
    318 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, PlatformCursor::TypeNoDrop);
    319 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, PlatformCursor::TypeCopy);
    320 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, PlatformCursor::TypeNone);
    321 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, PlatformCursor::TypeNotAllowed);
    322 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, PlatformCursor::TypeZoomIn);
    323 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, PlatformCursor::TypeZoomOut);
    324 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, PlatformCursor::TypeGrab);
    325 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, PlatformCursor::TypeGrabbing);
    326 COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, PlatformCursor::TypeCustom);
     283COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypePointer, Cursor::Pointer);
     284COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCross, Cursor::Cross);
     285COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHand, Cursor::Hand);
     286COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeIBeam, Cursor::IBeam);
     287COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWait, Cursor::Wait);
     288COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeHelp, Cursor::Help);
     289COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastResize, Cursor::EastResize);
     290COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthResize, Cursor::NorthResize);
     291COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastResize, Cursor::NorthEastResize);
     292COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestResize, Cursor::NorthWestResize);
     293COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthResize, Cursor::SouthResize);
     294COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastResize, Cursor::SouthEastResize);
     295COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestResize, Cursor::SouthWestResize);
     296COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestResize, Cursor::WestResize);
     297COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthSouthResize, Cursor::NorthSouthResize);
     298COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastWestResize, Cursor::EastWestResize);
     299COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastSouthWestResize, Cursor::NorthEastSouthWestResize);
     300COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestSouthEastResize, Cursor::NorthWestSouthEastResize);
     301COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeColumnResize, Cursor::ColumnResize);
     302COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeRowResize, Cursor::RowResize);
     303COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMiddlePanning, Cursor::MiddlePanning);
     304COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeEastPanning, Cursor::EastPanning);
     305COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthPanning, Cursor::NorthPanning);
     306COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthEastPanning, Cursor::NorthEastPanning);
     307COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNorthWestPanning, Cursor::NorthWestPanning);
     308COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthPanning, Cursor::SouthPanning);
     309COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthEastPanning, Cursor::SouthEastPanning);
     310COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeSouthWestPanning, Cursor::SouthWestPanning);
     311COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeWestPanning, Cursor::WestPanning);
     312COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeMove, Cursor::Move);
     313COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeVerticalText, Cursor::VerticalText);
     314COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCell, Cursor::Cell);
     315COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeContextMenu, Cursor::ContextMenu);
     316COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeAlias, Cursor::Alias);
     317COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeProgress, Cursor::Progress);
     318COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNoDrop, Cursor::NoDrop);
     319COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCopy, Cursor::Copy);
     320COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNone, Cursor::None);
     321COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeNotAllowed, Cursor::NotAllowed);
     322COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomIn, Cursor::ZoomIn);
     323COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeZoomOut, Cursor::ZoomOut);
     324COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrab, Cursor::Grab);
     325COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeGrabbing, Cursor::Grabbing);
     326COMPILE_ASSERT_MATCHING_ENUM(WebCursorInfo::TypeCustom, Cursor::Custom);
    327327
    328328COMPILE_ASSERT_MATCHING_ENUM(WebEditingActionTyped, EditorInsertActionTyped);
  • trunk/Source/WebKit/chromium/src/WebCursorInfo.cpp

    r95901 r134149  
    4040WebCursorInfo::WebCursorInfo(const Cursor& cursor)
    4141{
    42     type = static_cast<Type>(cursor.impl().type());
    43     hotSpot = cursor.impl().hotSpot();
    44     customImage = cursor.impl().customImage();
     42    type = static_cast<Type>(cursor.type());
     43    hotSpot = cursor.hotSpot();
     44    customImage = cursor.image();
    4545#ifdef WIN32
    4646    externalHandle = 0;
Note: See TracChangeset for help on using the changeset viewer.