summaryrefslogtreecommitdiffstats
path: root/webkit/glue/resources
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 09:04:06 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-20 09:04:06 +0000
commit292c90d8dfa53f696f79d6ba50e9699146a9602d (patch)
tree352a8ab6d89a5bf72621bab504d71acb0cf8ca19 /webkit/glue/resources
parentd99078ac2612eafbb245a5c7195788bb7e8d9c4c (diff)
downloadchromium_src-292c90d8dfa53f696f79d6ba50e9699146a9602d.zip
chromium_src-292c90d8dfa53f696f79d6ba50e9699146a9602d.tar.gz
chromium_src-292c90d8dfa53f696f79d6ba50e9699146a9602d.tar.bz2
fix pan scrolling
The ScrollView tries to load an image before setting the cursor to a pan scroll cursor. Not sure why this is needed, but add the image so it works. Review URL: http://codereview.chromium.org/11302 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/resources')
-rw-r--r--webkit/glue/resources/README.txt54
-rwxr-xr-xwebkit/glue/resources/pan_icon.pngbin0 -> 175 bytes
2 files changed, 50 insertions, 4 deletions
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
new file mode 100755
index 0000000..4ca8d70
--- /dev/null
+++ b/webkit/glue/resources/pan_icon.png
Binary files differ