summaryrefslogtreecommitdiffstats
path: root/android_webview/tools
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 00:25:39 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 00:25:39 +0000
commit19df700233f425265497f0d85da6381cc6d665e3 (patch)
tree1691ff2b9ce1a77753ab88fd5f45513121a3157d /android_webview/tools
parent5be58519425c2d3fec1c15d2278eaf8274e42fc2 (diff)
downloadchromium_src-19df700233f425265497f0d85da6381cc6d665e3.zip
chromium_src-19df700233f425265497f0d85da6381cc6d665e3.tar.gz
chromium_src-19df700233f425265497f0d85da6381cc6d665e3.tar.bz2
Move the WebCursor sources from webkit/glue to webkit/common/cursors.
This CL introduces a new target webkit_common which lives in webkit_common.gypi and builds a dll/static lib based on the component flag. This target only contains the webcursor sources for now. BUG=237249 TBR=jamesr@chromium.org, mnaganov@chromium.org, palmer@chromium.org, piman@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/15971005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203280 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/tools')
-rw-r--r--android_webview/tools/third_party_files_whitelist.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt
index 4f67aee..9a3b3dc 100644
--- a/android_webview/tools/third_party_files_whitelist.txt
+++ b/android_webview/tools/third_party_files_whitelist.txt
@@ -182,13 +182,13 @@ webkit/appcache/manifest_parser.cc
# code is taken from WebKit, the license for which we already pick up from
# webkit/.
webkit/appcache/manifest_parser.h
+# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on
+# Android.
+webkit/common/cursors/webcursor_gtk_data.h
# Copyright The Chromium Authors and Netscape Communications Corporation; BSD
# and (MPL, GPL v2 or LGPL v2) licenses. This third-party code is taken from
# Mozilla, the license for which we already pick up from third_party/npapi/.
webkit/glue/multipart_response_delegate.h
-# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on
-# Android.
-webkit/glue/webcursor_gtk_data.h
# This third-party code is taken from Mozilla, but is copyright Google and has
# been re-licensed under the Chromium license.
webkit/support/webkit_support_gfx.cc