wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 772153 - Add support for unprefixed cursor:zoom-in/out. r=bz

Browse Source
This commit is contained in:
Michael Harrison 2013-06-03 08:49:38 -04:00
parent 17a16f7155
commit f7b0b83f4a
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/events/src/nsEventStateManager.cpp
View File

@ -3781,10 +3781,10 @@ nsEventStateManager::SetCursor(int32_t aCursor, imgIContainer* aContainer,
case NS_STYLE_CURSOR_SPINNING:
c = eCursor_spinning;
break;
case NS_STYLE_CURSOR_MOZ_ZOOM_IN:
case NS_STYLE_CURSOR_ZOOM_IN:
c = eCursor_zoom_in;
break;
case NS_STYLE_CURSOR_MOZ_ZOOM_OUT:
case NS_STYLE_CURSOR_ZOOM_OUT:
c = eCursor_zoom_out;
break;
case NS_STYLE_CURSOR_NOT_ALLOWED:

4
layout/base/nsStyleConsts.h
View File

@ -345,8 +345,8 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_CURSOR_GRAB 21
#define NS_STYLE_CURSOR_GRABBING 22
#define NS_STYLE_CURSOR_SPINNING 23
#define NS_STYLE_CURSOR_MOZ_ZOOM_IN 24
#define NS_STYLE_CURSOR_MOZ_ZOOM_OUT 25
#define NS_STYLE_CURSOR_ZOOM_IN 24
#define NS_STYLE_CURSOR_ZOOM_OUT 25
#define NS_STYLE_CURSOR_NOT_ALLOWED 26
#define NS_STYLE_CURSOR_COL_RESIZE 27
#define NS_STYLE_CURSOR_ROW_RESIZE 28

2
layout/style/nsCSSKeywordList.h
View File

@ -524,6 +524,8 @@ CSS_KEY(x-large, x_large)
CSS_KEY(x-small, x_small)
CSS_KEY(xx-large, xx_large)
CSS_KEY(xx-small, xx_small)
CSS_KEY(zoom-in, zoom_in)
CSS_KEY(zoom-out, zoom_out)
// Appearance keywords for widget styles
CSS_KEY(radio, radio)

6
layout/style/nsCSSProps.cpp
View File

@ -886,11 +886,13 @@ const int32_t nsCSSProps::kCursorKTable[] = {
eCSSKeyword_ns_resize, NS_STYLE_CURSOR_NS_RESIZE,
eCSSKeyword_ew_resize, NS_STYLE_CURSOR_EW_RESIZE,
eCSSKeyword_none, NS_STYLE_CURSOR_NONE,
eCSSKeyword_zoom_in, NS_STYLE_CURSOR_ZOOM_IN,
eCSSKeyword_zoom_out, NS_STYLE_CURSOR_ZOOM_OUT,
// -moz- prefixed vendor specific
eCSSKeyword__moz_grab, NS_STYLE_CURSOR_GRAB,
eCSSKeyword__moz_grabbing, NS_STYLE_CURSOR_GRABBING,
eCSSKeyword__moz_zoom_in, NS_STYLE_CURSOR_MOZ_ZOOM_IN,
eCSSKeyword__moz_zoom_out, NS_STYLE_CURSOR_MOZ_ZOOM_OUT,
eCSSKeyword__moz_zoom_in, NS_STYLE_CURSOR_ZOOM_IN,
eCSSKeyword__moz_zoom_out, NS_STYLE_CURSOR_ZOOM_OUT,
eCSSKeyword_UNKNOWN,-1
};

2
layout/style/test/property_database.js
View File

@ -2339,7 +2339,7 @@ var gCSSProperties = {
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "auto" ],
other_values: [ "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress", "copy", "alias", "context-menu", "cell", "not-allowed", "col-resize", "row-resize", "no-drop", "vertical-text", "all-scroll", "nesw-resize", "nwse-resize", "ns-resize", "ew-resize", "none", "-moz-grab", "-moz-grabbing", "-moz-zoom-in", "-moz-zoom-out", "url(foo.png), move", "url(foo.png) 5 7, move", "url(foo.png) 12 3, url(bar.png), no-drop", "url(foo.png), url(bar.png) 7 2, wait", "url(foo.png) 3 2, url(bar.png) 7 9, pointer" ],
other_values: [ "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress", "copy", "alias", "context-menu", "cell", "not-allowed", "col-resize", "row-resize", "no-drop", "vertical-text", "all-scroll", "nesw-resize", "nwse-resize", "ns-resize", "ew-resize", "none", "zoom-in", "zoom-out", "-moz-grab", "-moz-grabbing", "-moz-zoom-in", "-moz-zoom-out", "url(foo.png), move", "url(foo.png) 5 7, move", "url(foo.png) 12 3, url(bar.png), no-drop", "url(foo.png), url(bar.png) 7 2, wait", "url(foo.png) 3 2, url(bar.png) 7 9, pointer" ],
invalid_values: [ "url(foo.png)", "url(foo.png) 5 5" ]
},
"direction": {