summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 23:33:58 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 23:33:58 +0000
commit796f48504671973b239858cc619375c662692783 (patch)
tree081791a0bec441610b99267fc80f17a9ddb11b1b /webkit
parent0bcde72cee05bb587e7069a490081834e6ceac1c (diff)
downloadchromium_src-796f48504671973b239858cc619375c662692783.zip
chromium_src-796f48504671973b239858cc619375c662692783.tar.gz
chromium_src-796f48504671973b239858cc619375c662692783.tar.bz2
Fix panning cursors. Converts them from PNG files to CUR files, so that the new WebCursor code will know how to load them.
BUG=4149 R=tony Review URL: http://codereview.chromium.org/9713 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/resources/pan_east.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_middle.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_north.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_north_east.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_north_west.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_south.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_south_east.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_south_west.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/resources/pan_west.curbin0 -> 4286 bytes
-rw-r--r--webkit/glue/webkit_resources.h36
-rw-r--r--webkit/glue/webkit_resources.rc18
-rw-r--r--webkit/tools/test_shell/test_shell.vcproj50
12 files changed, 73 insertions, 31 deletions
diff --git a/webkit/glue/resources/pan_east.cur b/webkit/glue/resources/pan_east.cur
new file mode 100644
index 0000000..4601aa4
--- /dev/null
+++ b/webkit/glue/resources/pan_east.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_middle.cur b/webkit/glue/resources/pan_middle.cur
new file mode 100644
index 0000000..b7a6298
--- /dev/null
+++ b/webkit/glue/resources/pan_middle.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_north.cur b/webkit/glue/resources/pan_north.cur
new file mode 100644
index 0000000..7df8eb6
--- /dev/null
+++ b/webkit/glue/resources/pan_north.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_north_east.cur b/webkit/glue/resources/pan_north_east.cur
new file mode 100644
index 0000000..a73ca09
--- /dev/null
+++ b/webkit/glue/resources/pan_north_east.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_north_west.cur b/webkit/glue/resources/pan_north_west.cur
new file mode 100644
index 0000000..a411a11
--- /dev/null
+++ b/webkit/glue/resources/pan_north_west.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_south.cur b/webkit/glue/resources/pan_south.cur
new file mode 100644
index 0000000..da3ee53
--- /dev/null
+++ b/webkit/glue/resources/pan_south.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_south_east.cur b/webkit/glue/resources/pan_south_east.cur
new file mode 100644
index 0000000..7d66192
--- /dev/null
+++ b/webkit/glue/resources/pan_south_east.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_south_west.cur b/webkit/glue/resources/pan_south_west.cur
new file mode 100644
index 0000000..f26c859c
--- /dev/null
+++ b/webkit/glue/resources/pan_south_west.cur
Binary files differ
diff --git a/webkit/glue/resources/pan_west.cur b/webkit/glue/resources/pan_west.cur
new file mode 100644
index 0000000..5d6552d
--- /dev/null
+++ b/webkit/glue/resources/pan_west.cur
Binary files differ
diff --git a/webkit/glue/webkit_resources.h b/webkit/glue/webkit_resources.h
index cc6bbd0..fdb734b 100644
--- a/webkit/glue/webkit_resources.h
+++ b/webkit/glue/webkit_resources.h
@@ -4,15 +4,6 @@
#define IDR_BROKENIMAGE 2000
#define IDR_TICKMARK_DASH 2001
#define IDR_FEED_PREVIEW 2002
-#define IDC_PAN_MIDDLE 2003
-#define IDC_PAN_NORTH 2004
-#define IDC_PAN_NORTH_EAST 2005
-#define IDC_PAN_EAST 2006
-#define IDC_PAN_SOUTH_EAST 2007
-#define IDC_PAN_SOUTH 2008
-#define IDC_PAN_SOUTH_WEST 2009
-#define IDC_PAN_WEST 2010
-#define IDC_PAN_NORTH_WEST 2011
#define IDC_ALIAS 2100
#define IDC_CELL 2101
@@ -22,13 +13,22 @@
#define IDC_VERTICALTEXT 2105
#define IDC_ZOOMIN 2106
#define IDC_ZOOMOUT 2107
+#define IDC_PAN_MIDDLE 2108
+#define IDC_PAN_NORTH 2109
+#define IDC_PAN_NORTH_EAST 2110
+#define IDC_PAN_EAST 2111
+#define IDC_PAN_SOUTH_EAST 2112
+#define IDC_PAN_SOUTH 2113
+#define IDC_PAN_SOUTH_WEST 2114
+#define IDC_PAN_WEST 2115
+#define IDC_PAN_NORTH_WEST 2116
-#define IDD_DEFAULT_PLUGIN_INSTALL_DIALOG 2108
-#define IDI_DEFAULT_PLUGIN_ICON 2109
-#define IDB_GET_THE_PLUGIN 2110
-#define IDC_PLUGIN_MAIN_LABEL 2111
-#define IDC_PLUGIN_INSTALL_LABEL 2112
-#define IDC_PLUGIN_URL_LABEL 2113
-#define IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL 2114
-#define IDC_PLUGIN_NAME 2115
-#define IDC_PLUGIN_NAME_VALUE 2116
+#define IDD_DEFAULT_PLUGIN_INSTALL_DIALOG 2208
+#define IDI_DEFAULT_PLUGIN_ICON 2209
+#define IDB_GET_THE_PLUGIN 2210
+#define IDC_PLUGIN_MAIN_LABEL 2211
+#define IDC_PLUGIN_INSTALL_LABEL 2212
+#define IDC_PLUGIN_URL_LABEL 2213
+#define IDC_PLUGIN_INSTALL_CONFIRMATION_LABEL 2214
+#define IDC_PLUGIN_NAME 2215
+#define IDC_PLUGIN_NAME_VALUE 2216
diff --git a/webkit/glue/webkit_resources.rc b/webkit/glue/webkit_resources.rc
index 8588ab5..8cf3064 100644
--- a/webkit/glue/webkit_resources.rc
+++ b/webkit/glue/webkit_resources.rc
@@ -17,15 +17,6 @@
IDR_BROKENIMAGE BINDATA "webkit\\glue\\resources\\broken-image.gif"
IDR_TICKMARK_DASH BINDATA "webkit\\glue\\resources\\dash.png"
IDR_FEED_PREVIEW BINDATA "webkit\\glue\\resources\\feed.html"
-IDC_PAN_MIDDLE BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panIcon.png"
-IDC_PAN_NORTH BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panNorthCursor.png"
-IDC_PAN_NORTH_EAST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panNorthEastCursor.png"
-IDC_PAN_EAST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panEastCursor.png"
-IDC_PAN_SOUTH_EAST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panSouthEastCursor.png"
-IDC_PAN_SOUTH BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panSouthCursor.png"
-IDC_PAN_SOUTH_WEST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panSouthWestCursor.png"
-IDC_PAN_WEST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panWestCursor.png"
-IDC_PAN_NORTH_WEST BINDATA "third_party\\WebKit\\WebKit\\win\\WebKit.vcproj\\panNorthWestCursor.png"
/////////////////////////////////////////////////////////////////////////////
//
@@ -40,6 +31,15 @@ IDC_ROWRESIZE CURSOR "webkit\\glue\\resources\\row_resize.cur"
IDC_VERTICALTEXT CURSOR "webkit\\glue\\resources\\vertical_text.cur"
IDC_ZOOMIN CURSOR "webkit\\glue\\resources\\zoom_in.cur"
IDC_ZOOMOUT CURSOR "webkit\\glue\\resources\\zoom_out.cur"
+IDC_PAN_MIDDLE CURSOR "webkit\\glue\\resources\\pan_middle.cur"
+IDC_PAN_NORTH CURSOR "webkit\\glue\\resources\\pan_north.cur"
+IDC_PAN_NORTH_EAST CURSOR "webkit\\glue\\resources\\pan_north_east.cur"
+IDC_PAN_EAST CURSOR "webkit\\glue\\resources\\pan_east.cur"
+IDC_PAN_SOUTH_EAST CURSOR "webkit\\glue\\resources\\pan_south_east.cur"
+IDC_PAN_SOUTH CURSOR "webkit\\glue\\resources\\pan_south.cur"
+IDC_PAN_SOUTH_WEST CURSOR "webkit\\glue\\resources\\pan_south_west.cur"
+IDC_PAN_WEST CURSOR "webkit\\glue\\resources\\pan_west.cur"
+IDC_PAN_NORTH_WEST CURSOR "webkit\\glue\\resources\\pan_north_west.cur"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index 4e97611..1b154fc 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -12,6 +12,8 @@
Name="Win32"
/>
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
@@ -147,6 +149,42 @@
>
</File>
<File
+ RelativePath="..\..\glue\resources\pan_east.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_middle.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_north.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_north_east.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_north_west.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_south.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_south_east.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_south_west.cur"
+ >
+ </File>
+ <File
+ RelativePath="..\..\glue\resources\pan_west.cur"
+ >
+ </File>
+ <File
RelativePath=".\resource.h"
>
</File>
@@ -163,6 +201,10 @@
>
</File>
<File
+ RelativePath="..\..\glue\webkit_resources.rc"
+ >
+ </File>
+ <File
RelativePath="$(IntDir)\..\localized_strings\webkit_strings_en-US.rc"
>
</File>
@@ -224,10 +266,6 @@
>
</File>
<File
- RelativePath=".\test_shell_win.cc"
- >
- </File>
- <File
RelativePath=".\test_shell_request_context.cc"
>
</File>
@@ -244,6 +282,10 @@
>
</File>
<File
+ RelativePath=".\test_shell_win.cc"
+ >
+ </File>
+ <File
RelativePath=".\test_webview_delegate.cc"
>
</File>
generated by cgit v1.1 at 2025-01-31 19:32:21 +0000