diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 13:54:25 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 13:54:25 +0000 |
| commit | 4664d6f30434ab7453c7d5e912345f95ececdb07 (patch) | |
| tree | 55682c597e7f7d2771794a98ad8cb36337492c25 /webkit | |
| parent | c2e34c4eb4068b9583cce3c5fd322169ce4a8485 (diff) | |
| download | chromium_src-4664d6f30434ab7453c7d5e912345f95ececdb07.zip chromium_src-4664d6f30434ab7453c7d5e912345f95ececdb07.tar.gz chromium_src-4664d6f30434ab7453c7d5e912345f95ececdb07.tar.bz2 | |
Add custom overhang pattern for rubber-banding.
This will be used in WebKit for overhang painting.
BUG=93397
TEST=none
Review URL: http://codereview.chromium.org/7711007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/resources/overhang_pattern.png | bin | 0 -> 20087 bytes | |||
| -rw-r--r-- | webkit/glue/webkit_resources.grd | 3 | ||||
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/webkit/glue/resources/overhang_pattern.png b/webkit/glue/resources/overhang_pattern.png Binary files differnew file mode 100644 index 0000000..042a7c8 --- /dev/null +++ b/webkit/glue/resources/overhang_pattern.png diff --git a/webkit/glue/webkit_resources.grd b/webkit/glue/webkit_resources.grd index e21bdef..175b776 100644 --- a/webkit/glue/webkit_resources.grd +++ b/webkit/glue/webkit_resources.grd @@ -52,6 +52,9 @@ <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB" file="resources\mediaplayer_volume_slider_thumb.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER" file="resources\mediaplayer_volume_slider_thumb_hover.png" type="BINDATA" /> <include name="IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN" file="resources\mediaplayer_volume_slider_thumb_down.png" type="BINDATA" /> + <if expr="is_macosx"> + <include name="IDR_OVERHANG_PATTERN" file="resources\overhang_pattern.png" type="BINDATA" /> + </if> <include name="IDC_PAN_EAST" file="resources\pan_east.cur" type="CURSOR" /> <include name="IDC_PAN_MIDDLE" file="resources\pan_middle.cur" type="CURSOR" /> <include name="IDC_PAN_NORTH" file="resources\pan_north.cur" type="CURSOR" /> diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index fb1c98d..6a0aa1a 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -394,6 +394,9 @@ const DataResource kDataResources[] = { IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_HOVER }, { "mediaplayerVolumeSliderThumbDown", IDR_MEDIAPLAYER_VOLUME_SLIDER_THUMB_DOWN }, +#if defined(OS_MACOSX) + { "overhangPattern", IDR_OVERHANG_PATTERN }, +#endif { "panIcon", IDR_PAN_SCROLL_ICON }, { "searchCancel", IDR_SEARCH_CANCEL }, { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED }, |
