summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 18:32:23 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-14 18:32:23 +0000
commitfd8746e16aa0dc6de45beb8fcd22f46dbb2321ba (patch)
treec6b306dec24cb6eac4256aa8cc8d042a9cd2c0e9 /webkit/glue
parentb755635c32ae984e210320a3e92c03d4e4dbd263 (diff)
downloadchromium_src-fd8746e16aa0dc6de45beb8fcd22f46dbb2321ba.zip
chromium_src-fd8746e16aa0dc6de45beb8fcd22f46dbb2321ba.tar.gz
chromium_src-fd8746e16aa0dc6de45beb8fcd22f46dbb2321ba.tar.bz2
Fix build bustage. Update enum names.
TBR=dglazkov Review URL: http://codereview.chromium.org/18235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webcursor.cc6
-rw-r--r--webkit/glue/webcursor_gtk.cc90
-rw-r--r--webkit/glue/webcursor_mac.mm86
-rw-r--r--webkit/glue/webcursor_win.cc112
4 files changed, 147 insertions, 147 deletions
diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc
index 76673e5..39d6598 100644
--- a/webkit/glue/webcursor.cc
+++ b/webkit/glue/webcursor.cc
@@ -13,7 +13,7 @@
#include "base/pickle.h"
WebCursor::WebCursor()
- : type_(WebCore::PlatformCursor::typePointer) {
+ : type_(WebCore::PlatformCursor::TypePointer) {
InitPlatformData();
}
@@ -91,7 +91,7 @@ bool WebCursor::Serialize(Pickle* pickle) const {
}
bool WebCursor::IsCustom() const {
- return type_ == WebCore::PlatformCursor::typeCustom;
+ return type_ == WebCore::PlatformCursor::TypeCustom;
}
bool WebCursor::IsEqual(const WebCursor& other) const {
@@ -107,7 +107,7 @@ bool WebCursor::IsEqual(const WebCursor& other) const {
}
void WebCursor::Clear() {
- type_ = WebCore::PlatformCursor::typePointer;
+ type_ = WebCore::PlatformCursor::TypePointer;
hotspot_.set_x(0);
hotspot_.set_y(0);
custom_size_.set_width(0);
diff --git a/webkit/glue/webcursor_gtk.cc b/webkit/glue/webcursor_gtk.cc
index ab8fdfc..0fc03c0 100644
--- a/webkit/glue/webcursor_gtk.cc
+++ b/webkit/glue/webcursor_gtk.cc
@@ -48,87 +48,87 @@ GdkCursorType WebCursor::GetCursorType() const {
// of the default X theme, but beware that the user's cursor theme can
// change everything.
switch (type_) {
- case PlatformCursor::typePointer:
+ case PlatformCursor::TypePointer:
return GDK_ARROW;
- case PlatformCursor::typeCross:
+ case PlatformCursor::TypeCross:
return GDK_CROSS;
- case PlatformCursor::typeHand:
+ case PlatformCursor::TypeHand:
return GDK_HAND2;
- case PlatformCursor::typeIBeam:
+ case PlatformCursor::TypeIBeam:
return GDK_XTERM;
- case PlatformCursor::typeWait:
+ case PlatformCursor::TypeWait:
return GDK_WATCH;
- case PlatformCursor::typeHelp:
+ case PlatformCursor::TypeHelp:
return GDK_QUESTION_ARROW;
- case PlatformCursor::typeEastResize:
+ case PlatformCursor::TypeEastResize:
return GDK_RIGHT_SIDE;
- case PlatformCursor::typeNorthResize:
+ case PlatformCursor::TypeNorthResize:
return GDK_TOP_SIDE;
- case PlatformCursor::typeNorthEastResize:
+ case PlatformCursor::TypeNorthEastResize:
return GDK_TOP_RIGHT_CORNER;
- case PlatformCursor::typeNorthWestResize:
+ case PlatformCursor::TypeNorthWestResize:
return GDK_TOP_LEFT_CORNER;
- case PlatformCursor::typeSouthResize:
+ case PlatformCursor::TypeSouthResize:
return GDK_BOTTOM_SIDE;
- case PlatformCursor::typeSouthEastResize:
+ case PlatformCursor::TypeSouthEastResize:
return GDK_BOTTOM_LEFT_CORNER;
- case PlatformCursor::typeSouthWestResize:
+ case PlatformCursor::TypeSouthWestResize:
return GDK_BOTTOM_RIGHT_CORNER;
- case PlatformCursor::typeWestResize:
+ case PlatformCursor::TypeWestResize:
return GDK_LEFT_SIDE;
- case PlatformCursor::typeNorthSouthResize:
+ case PlatformCursor::TypeNorthSouthResize:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeEastWestResize:
+ case PlatformCursor::TypeEastWestResize:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNorthEastSouthWestResize:
+ case PlatformCursor::TypeNorthEastSouthWestResize:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNorthWestSouthEastResize:
+ case PlatformCursor::TypeNorthWestSouthEastResize:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeColumnResize:
+ case PlatformCursor::TypeColumnResize:
return GDK_SB_H_DOUBLE_ARROW; // TODO(evanm): is this correct?
- case PlatformCursor::typeRowResize:
+ case PlatformCursor::TypeRowResize:
return GDK_SB_V_DOUBLE_ARROW; // TODO(evanm): is this correct?
- case PlatformCursor::typeMiddlePanning:
+ case PlatformCursor::TypeMiddlePanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeEastPanning:
+ case PlatformCursor::TypeEastPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNorthPanning:
+ case PlatformCursor::TypeNorthPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNorthEastPanning:
+ case PlatformCursor::TypeNorthEastPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNorthWestPanning:
+ case PlatformCursor::TypeNorthWestPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeSouthPanning:
+ case PlatformCursor::TypeSouthPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeSouthEastPanning:
+ case PlatformCursor::TypeSouthEastPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeSouthWestPanning:
+ case PlatformCursor::TypeSouthWestPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeWestPanning:
+ case PlatformCursor::TypeWestPanning:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeMove:
+ case PlatformCursor::TypeMove:
return GDK_FLEUR;
- case PlatformCursor::typeVerticalText:
+ case PlatformCursor::TypeVerticalText:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeCell:
+ case PlatformCursor::TypeCell:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeContextMenu:
+ case PlatformCursor::TypeContextMenu:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeAlias:
+ case PlatformCursor::TypeAlias:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeProgress:
+ case PlatformCursor::TypeProgress:
return GDK_WATCH;
- case PlatformCursor::typeNoDrop:
+ case PlatformCursor::TypeNoDrop:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeCopy:
+ case PlatformCursor::TypeCopy:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNone:
+ case PlatformCursor::TypeNone:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeNotAllowed:
+ case PlatformCursor::TypeNotAllowed:
NOTIMPLEMENTED(); return GDK_ARROW;
- case PlatformCursor::typeZoomIn:
- case PlatformCursor::typeZoomOut:
- case PlatformCursor::typeCustom:
+ case PlatformCursor::TypeZoomIn:
+ case PlatformCursor::TypeZoomOut:
+ case PlatformCursor::TypeCustom:
return GDK_CURSOR_IS_PIXMAP;
}
NOTREACHED();
@@ -137,13 +137,13 @@ GdkCursorType WebCursor::GetCursorType() const {
GdkCursor* WebCursor::GetCustomCursor() const {
switch (type_) {
- case PlatformCursor::typeZoomIn:
+ case PlatformCursor::TypeZoomIn:
return GetInlineCustomCursor(CustomCursorZoomIn);
- case PlatformCursor::typeZoomOut:
+ case PlatformCursor::TypeZoomOut:
return GetInlineCustomCursor(CustomCursorZoomOut);
}
- if (type_ != PlatformCursor::typeCustom) {
+ if (type_ != PlatformCursor::TypeCustom) {
NOTREACHED();
return NULL;
}
diff --git a/webkit/glue/webcursor_mac.mm b/webkit/glue/webcursor_mac.mm
index 9d83775..054d05b 100644
--- a/webkit/glue/webcursor_mac.mm
+++ b/webkit/glue/webcursor_mac.mm
@@ -59,81 +59,81 @@ NSCursor* CreateCustomCursor(const std::vector<char>& custom_data,
// We're matching Safari's cursor choices; see platform/mac/CursorMac.mm
NSCursor* WebCursor::GetCursor() const {
- switch (type_) {
- case PlatformCursor::typePointer:
+ switch (Type_) {
+ case PlatformCursor::TypePointer:
return [NSCursor arrowCursor];
- case PlatformCursor::typeCross:
+ case PlatformCursor::TypeCross:
return LoadCursor("crossHairCursor", 11, 11);
- case PlatformCursor::typeHand:
+ case PlatformCursor::TypeHand:
return LoadCursor("linkCursor", 6, 1);
- case PlatformCursor::typeIBeam:
+ case PlatformCursor::TypeIBeam:
return [NSCursor IBeamCursor];
- case PlatformCursor::typeWait:
+ case PlatformCursor::TypeWait:
return LoadCursor("waitCursor", 7, 7);
- case PlatformCursor::typeHelp:
+ case PlatformCursor::TypeHelp:
return LoadCursor("helpCursor", 8, 8);
- case PlatformCursor::typeEastResize:
- case PlatformCursor::typeEastPanning:
+ case PlatformCursor::TypeEastResize:
+ case PlatformCursor::TypeEastPanning:
return LoadCursor("eastResizeCursor", 14, 7);
- case PlatformCursor::typeNorthResize:
- case PlatformCursor::typeNorthPanning:
+ case PlatformCursor::TypeNorthResize:
+ case PlatformCursor::TypeNorthPanning:
return LoadCursor("northResizeCursor", 7, 1);
- case PlatformCursor::typeNorthEastResize:
- case PlatformCursor::typeNorthEastPanning:
+ case PlatformCursor::TypeNorthEastResize:
+ case PlatformCursor::TypeNorthEastPanning:
return LoadCursor("northEastResizeCursor", 14, 1);
- case PlatformCursor::typeNorthWestResize:
- case PlatformCursor::typeNorthWestPanning:
+ case PlatformCursor::TypeNorthWestResize:
+ case PlatformCursor::TypeNorthWestPanning:
return LoadCursor("northWestResizeCursor", 0, 0);
- case PlatformCursor::typeSouthResize:
- case PlatformCursor::typeSouthPanning:
+ case PlatformCursor::TypeSouthResize:
+ case PlatformCursor::TypeSouthPanning:
return LoadCursor("southResizeCursor", 7, 14);
- case PlatformCursor::typeSouthEastResize:
- case PlatformCursor::typeSouthEastPanning:
+ case PlatformCursor::TypeSouthEastResize:
+ case PlatformCursor::TypeSouthEastPanning:
return LoadCursor("southEastResizeCursor", 14, 14);
- case PlatformCursor::typeSouthWestResize:
- case PlatformCursor::typeSouthWestPanning:
+ case PlatformCursor::TypeSouthWestResize:
+ case PlatformCursor::TypeSouthWestPanning:
return LoadCursor("southWestResizeCursor", 1, 14);
- case PlatformCursor::typeWestResize:
- case PlatformCursor::typeWestPanning:
+ case PlatformCursor::TypeWestResize:
+ case PlatformCursor::TypeWestPanning:
return LoadCursor("westResizeCursor", 1, 7);
- case PlatformCursor::typeNorthSouthResize:
+ case PlatformCursor::TypeNorthSouthResize:
return LoadCursor("northSouthResizeCursor", 7, 7);
- case PlatformCursor::typeEastWestResize:
+ case PlatformCursor::TypeEastWestResize:
return LoadCursor("eastWestResizeCursor", 7, 7);
- case PlatformCursor::typeNorthEastSouthWestResize:
+ case PlatformCursor::TypeNorthEastSouthWestResize:
return LoadCursor("northEastSouthWestResizeCursor", 7, 7);
- case PlatformCursor::typeNorthWestSouthEastResize:
+ case PlatformCursor::TypeNorthWestSouthEastResize:
return LoadCursor("northWestSouthEastResizeCursor", 7, 7);
- case PlatformCursor::typeColumnResize:
+ case PlatformCursor::TypeColumnResize:
return [NSCursor resizeLeftRightCursor];
- case PlatformCursor::typeRowResize:
+ case PlatformCursor::TypeRowResize:
return [NSCursor resizeUpDownCursor];
- case PlatformCursor::typeMiddlePanning:
- case PlatformCursor::typeMove:
+ case PlatformCursor::TypeMiddlePanning:
+ case PlatformCursor::TypeMove:
return LoadCursor("moveCursor", 7, 7);
- case PlatformCursor::typeVerticalText:
+ case PlatformCursor::TypeVerticalText:
return LoadCursor("verticalTextCursor", 7, 7);
- case PlatformCursor::typeCell:
+ case PlatformCursor::TypeCell:
return LoadCursor("cellCursor", 7, 7);
- case PlatformCursor::typeContextMenu:
+ case PlatformCursor::TypeContextMenu:
return LoadCursor("contextMenuCursor", 3, 2);
- case PlatformCursor::typeAlias:
+ case PlatformCursor::TypeAlias:
return LoadCursor("aliasCursor", 11, 3);
- case PlatformCursor::typeProgress:
+ case PlatformCursor::TypeProgress:
return LoadCursor("progressCursor", 3, 2);
- case PlatformCursor::typeNoDrop:
+ case PlatformCursor::TypeNoDrop:
return LoadCursor("noDropCursor", 3, 1);
- case PlatformCursor::typeCopy:
+ case PlatformCursor::TypeCopy:
return LoadCursor("copyCursor", 3, 2);
- case PlatformCursor::typeNone:
+ case PlatformCursor::TypeNone:
return LoadCursor("noneCursor", 7, 7);
- case PlatformCursor::typeNotAllowed:
+ case PlatformCursor::TypeNotAllowed:
return LoadCursor("notAllowedCursor", 11, 11);
- case PlatformCursor::typeZoomIn:
+ case PlatformCursor::TypeZoomIn:
return LoadCursor("zoomInCursor", 7, 7);
- case PlatformCursor::typeZoomOut:
+ case PlatformCursor::TypeZoomOut:
return LoadCursor("zoomOutCursor", 7, 7);
- case PlatformCursor::typeCustom:
+ case PlatformCursor::TypeCustom:
return CreateCustomCursor(custom_data_, custom_size_, hotspot_);
}
NOTREACHED();
diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc
index a31b75d..60e7561 100644
--- a/webkit/glue/webcursor_win.cc
+++ b/webkit/glue/webcursor_win.cc
@@ -20,87 +20,87 @@ using WebCore::PlatformCursor;
static LPCWSTR ToCursorID(PlatformCursor::Type type) {
switch (type) {
- case PlatformCursor::typePointer:
+ case PlatformCursor::TypePointer:
return IDC_ARROW;
- case PlatformCursor::typeCross:
+ case PlatformCursor::TypeCross:
return IDC_CROSS;
- case PlatformCursor::typeHand:
+ case PlatformCursor::TypeHand:
return IDC_HAND;
- case PlatformCursor::typeIBeam:
+ case PlatformCursor::TypeIBeam:
return IDC_IBEAM;
- case PlatformCursor::typeWait:
+ case PlatformCursor::TypeWait:
return IDC_WAIT;
- case PlatformCursor::typeHelp:
+ case PlatformCursor::TypeHelp:
return IDC_HELP;
- case PlatformCursor::typeEastResize:
+ case PlatformCursor::TypeEastResize:
return IDC_SIZEWE;
- case PlatformCursor::typeNorthResize:
+ case PlatformCursor::TypeNorthResize:
return IDC_SIZENS;
- case PlatformCursor::typeNorthEastResize:
+ case PlatformCursor::TypeNorthEastResize:
return IDC_SIZENESW;
- case PlatformCursor::typeNorthWestResize:
+ case PlatformCursor::TypeNorthWestResize:
return IDC_SIZENWSE;
- case PlatformCursor::typeSouthResize:
+ case PlatformCursor::TypeSouthResize:
return IDC_SIZENS;
- case PlatformCursor::typeSouthEastResize:
+ case PlatformCursor::TypeSouthEastResize:
return IDC_SIZENWSE;
- case PlatformCursor::typeSouthWestResize:
+ case PlatformCursor::TypeSouthWestResize:
return IDC_SIZENESW;
- case PlatformCursor::typeWestResize:
+ case PlatformCursor::TypeWestResize:
return IDC_SIZEWE;
- case PlatformCursor::typeNorthSouthResize:
+ case PlatformCursor::TypeNorthSouthResize:
return IDC_SIZENS;
- case PlatformCursor::typeEastWestResize:
+ case PlatformCursor::TypeEastWestResize:
return IDC_SIZEWE;
- case PlatformCursor::typeNorthEastSouthWestResize:
+ case PlatformCursor::TypeNorthEastSouthWestResize:
return IDC_SIZENESW;
- case PlatformCursor::typeNorthWestSouthEastResize:
+ case PlatformCursor::TypeNorthWestSouthEastResize:
return IDC_SIZENWSE;
- case PlatformCursor::typeColumnResize:
+ case PlatformCursor::TypeColumnResize:
return MAKEINTRESOURCE(IDC_COLRESIZE);
- case PlatformCursor::typeRowResize:
+ case PlatformCursor::TypeRowResize:
return MAKEINTRESOURCE(IDC_ROWRESIZE);
- case PlatformCursor::typeMiddlePanning:
+ case PlatformCursor::TypeMiddlePanning:
return MAKEINTRESOURCE(IDC_PAN_MIDDLE);
- case PlatformCursor::typeEastPanning:
+ case PlatformCursor::TypeEastPanning:
return MAKEINTRESOURCE(IDC_PAN_EAST);
- case PlatformCursor::typeNorthPanning:
+ case PlatformCursor::TypeNorthPanning:
return MAKEINTRESOURCE(IDC_PAN_NORTH);
- case PlatformCursor::typeNorthEastPanning:
+ case PlatformCursor::TypeNorthEastPanning:
return MAKEINTRESOURCE(IDC_PAN_NORTH_EAST);
- case PlatformCursor::typeNorthWestPanning:
+ case PlatformCursor::TypeNorthWestPanning:
return MAKEINTRESOURCE(IDC_PAN_NORTH_WEST);
- case PlatformCursor::typeSouthPanning:
+ case PlatformCursor::TypeSouthPanning:
return MAKEINTRESOURCE(IDC_PAN_SOUTH);
- case PlatformCursor::typeSouthEastPanning:
+ case PlatformCursor::TypeSouthEastPanning:
return MAKEINTRESOURCE(IDC_PAN_SOUTH_EAST);
- case PlatformCursor::typeSouthWestPanning:
+ case PlatformCursor::TypeSouthWestPanning:
return MAKEINTRESOURCE(IDC_PAN_SOUTH_WEST);
- case PlatformCursor::typeWestPanning:
+ case PlatformCursor::TypeWestPanning:
return MAKEINTRESOURCE(IDC_PAN_WEST);
- case PlatformCursor::typeMove:
+ case PlatformCursor::TypeMove:
return IDC_SIZEALL;
- case PlatformCursor::typeVerticalText:
+ case PlatformCursor::TypeVerticalText:
return MAKEINTRESOURCE(IDC_VERTICALTEXT);
- case PlatformCursor::typeCell:
+ case PlatformCursor::TypeCell:
return MAKEINTRESOURCE(IDC_CELL);
- case PlatformCursor::typeContextMenu:
+ case PlatformCursor::TypeContextMenu:
return MAKEINTRESOURCE(IDC_ARROW);
- case PlatformCursor::typeAlias:
+ case PlatformCursor::TypeAlias:
return MAKEINTRESOURCE(IDC_ALIAS);
- case PlatformCursor::typeProgress:
+ case PlatformCursor::TypeProgress:
return IDC_APPSTARTING;
- case PlatformCursor::typeNoDrop:
+ case PlatformCursor::TypeNoDrop:
return IDC_NO;
- case PlatformCursor::typeCopy:
+ case PlatformCursor::TypeCopy:
return MAKEINTRESOURCE(IDC_COPYCUR);
- case PlatformCursor::typeNone:
+ case PlatformCursor::TypeNone:
return IDC_ARROW;
- case PlatformCursor::typeNotAllowed:
+ case PlatformCursor::TypeNotAllowed:
return IDC_NO;
- case PlatformCursor::typeZoomIn:
+ case PlatformCursor::TypeZoomIn:
return MAKEINTRESOURCE(IDC_ZOOMIN);
- case PlatformCursor::typeZoomOut:
+ case PlatformCursor::TypeZoomOut:
return MAKEINTRESOURCE(IDC_ZOOMOUT);
}
NOTREACHED();
@@ -116,25 +116,25 @@ static PlatformCursor::Type ToPlatformCursorType(HCURSOR cursor) {
HCURSOR cursor;
PlatformCursor::Type type;
} kStandardCursors[] = {
- { LoadCursor(NULL, IDC_ARROW), PlatformCursor::typePointer },
- { LoadCursor(NULL, IDC_IBEAM), PlatformCursor::typeIBeam },
- { LoadCursor(NULL, IDC_WAIT), PlatformCursor::typeWait },
- { LoadCursor(NULL, IDC_CROSS), PlatformCursor::typeCross },
- { LoadCursor(NULL, IDC_SIZENWSE), PlatformCursor::typeNorthWestResize },
- { LoadCursor(NULL, IDC_SIZENESW), PlatformCursor::typeNorthEastResize },
- { LoadCursor(NULL, IDC_SIZEWE), PlatformCursor::typeEastWestResize },
- { LoadCursor(NULL, IDC_SIZENS), PlatformCursor::typeNorthSouthResize },
- { LoadCursor(NULL, IDC_SIZEALL), PlatformCursor::typeMove },
- { LoadCursor(NULL, IDC_NO), PlatformCursor::typeNotAllowed },
- { LoadCursor(NULL, IDC_HAND), PlatformCursor::typeHand },
- { LoadCursor(NULL, IDC_APPSTARTING), PlatformCursor::typeProgress },
- { LoadCursor(NULL, IDC_HELP), PlatformCursor::typeHelp },
+ { LoadCursor(NULL, IDC_ARROW), PlatformCursor::TypePointer },
+ { LoadCursor(NULL, IDC_IBEAM), PlatformCursor::TypeIBeam },
+ { LoadCursor(NULL, IDC_WAIT), PlatformCursor::TypeWait },
+ { LoadCursor(NULL, IDC_CROSS), PlatformCursor::TypeCross },
+ { LoadCursor(NULL, IDC_SIZENWSE), PlatformCursor::TypeNorthWestResize },
+ { LoadCursor(NULL, IDC_SIZENESW), PlatformCursor::TypeNorthEastResize },
+ { LoadCursor(NULL, IDC_SIZEWE), PlatformCursor::TypeEastWestResize },
+ { LoadCursor(NULL, IDC_SIZENS), PlatformCursor::TypeNorthSouthResize },
+ { LoadCursor(NULL, IDC_SIZEALL), PlatformCursor::TypeMove },
+ { LoadCursor(NULL, IDC_NO), PlatformCursor::TypeNotAllowed },
+ { LoadCursor(NULL, IDC_HAND), PlatformCursor::TypeHand },
+ { LoadCursor(NULL, IDC_APPSTARTING), PlatformCursor::TypeProgress },
+ { LoadCursor(NULL, IDC_HELP), PlatformCursor::TypeHelp },
};
for (int i = 0; i < arraysize(kStandardCursors); i++) {
if (cursor == kStandardCursors[i].cursor)
return kStandardCursors[i].type;
}
- return PlatformCursor::typeCustom;
+ return PlatformCursor::TypeCustom;
}
HCURSOR WebCursor::GetCursor(HINSTANCE module_handle){
@@ -196,7 +196,7 @@ void WebCursor::InitFromExternalCursor(HCURSOR cursor) {
*this = WebCursor(cursor_type);
- if (cursor_type == WebCore::PlatformCursor::typeCustom) {
+ if (cursor_type == WebCore::PlatformCursor::TypeCustom) {
external_cursor_ = cursor;
}
}