diff options
| -rw-r--r-- | webkit/glue/chromium_bridge_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/resources/README.txt | 54 | ||||
| -rwxr-xr-x | webkit/glue/resources/pan_icon.png | bin | 0 -> 175 bytes | |||
| -rw-r--r-- | webkit/glue/webkit_resources.h | 1 | ||||
| -rw-r--r-- | webkit/glue/webkit_resources.rc | 1 |
5 files changed, 54 insertions, 4 deletions
diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index 7427e39..effc33e 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -371,6 +371,8 @@ PassRefPtr<Image> ChromiumBridge::loadPlatformImageResource(const char* name) { resource_id = IDR_BROKENIMAGE; } else if (!strcmp(name, "tickmarkDash")) { resource_id = IDR_TICKMARK_DASH; + } else if (!strcmp(name, "panIcon")) { + resource_id = IDR_PAN_SCROLL_ICON; } else if (!strcmp(name, "deleteButton") || !strcmp(name, "deleteButtonPressed")) { NOTREACHED() << "Image resource " << name << " does not exist yet."; diff --git a/webkit/glue/resources/README.txt b/webkit/glue/resources/README.txt index 678a136..5210ff4 100644 --- a/webkit/glue/resources/README.txt +++ b/webkit/glue/resources/README.txt @@ -1,7 +1,7 @@ -The following files in this directory are copied from the Mozilla source tree, -where they are licensed under the MPL/GPL/LGPL. While binary files do not -contain a license block, I have pasted the relevant Mozilla license block at -the bottom of this file. +The files listed below and found in this directory are copied from the +Mozilla source tree, where they are licensed under the MPL/GPL/LGPL. While +binary files do not contain a license block, I have pasted the relevant +Mozilla license block below. aliasb.cur broken-image.gif @@ -48,3 +48,49 @@ zoom_out.cur * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ + +///////////////////////////////////////////////////////////////////////////// + +The files listed below and found in this directory are copied from the WebKit +source tree or are derivative works of files from the WebKit source tree. +They are licensed under a BSD license. While binary files do not contain +a license block, I have pasted the relevant WebKit license block below. + +pan_icon.png +pan_east.cur +pan_middle.cur +pan_north.cur +pan_north_east.cur +pan_north_west.cur +pan_south.cur +pan_south_east.cur +pan_south_west.cur +pan_west.cur + +// ***** BEGIN LICENSE BLOCK ***** + +Copyright (C) 2005 Apple Computer, Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + its contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/webkit/glue/resources/pan_icon.png b/webkit/glue/resources/pan_icon.png Binary files differnew file mode 100755 index 0000000..4ca8d70 --- /dev/null +++ b/webkit/glue/resources/pan_icon.png diff --git a/webkit/glue/webkit_resources.h b/webkit/glue/webkit_resources.h index fdb734b..0e86c933 100644 --- a/webkit/glue/webkit_resources.h +++ b/webkit/glue/webkit_resources.h @@ -4,6 +4,7 @@ #define IDR_BROKENIMAGE 2000 #define IDR_TICKMARK_DASH 2001 #define IDR_FEED_PREVIEW 2002 +#define IDR_PAN_SCROLL_ICON 2003 #define IDC_ALIAS 2100 #define IDC_CELL 2101 diff --git a/webkit/glue/webkit_resources.rc b/webkit/glue/webkit_resources.rc index 8cf3064..f1505e5 100644 --- a/webkit/glue/webkit_resources.rc +++ b/webkit/glue/webkit_resources.rc @@ -17,6 +17,7 @@ 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" +IDR_PAN_SCROLL_ICON BINDATA "webkit\\glue\\resources\\pan_icon.png" ///////////////////////////////////////////////////////////////////////////// // |
