diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 18:31:42 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-22 18:31:42 +0000 |
| commit | 756fbde6911d40d376680c7ab9b576620f64c108 (patch) | |
| tree | db279a9daa90a0842a5eb035ffd6ec796ae851d2 /android_webview/tools | |
| parent | 3b06f2ae871249581d6b4aeb47921f102b638156 (diff) | |
| download | chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.zip chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.gz chromium_src-756fbde6911d40d376680c7ab9b576620f64c108.tar.bz2 | |
Move webkitplatformsupport_impl and related from glue to child
Picking up Ananta's change.
Move the webkitplatformsupport_impl.cc/.h files out of webkit\glue to
webkit\child.
This requires moving the following files out of webkit\glue to webkit\child:
1. weburlloader_impl.cc/.h
2. weburlrequest_extradata_impl.cc/.h
3. websocketstreamhandle_impl.cc/.h
4. weburlresponse_extradata_impl.cc/.h
5. websocketstreamhandle_delegate.h
6. ftp_directory_listing_response_delegate.cc/.h
7. multipart_response_delegate.cc/.h
8. multipart_response_delegate_unittest.cc
9. resource_loader_bridge.cc/.h
The following files have been moved to webkit\common:
2. resource_type.cc/.h
Move MemoryUsageKB out of webkit_glue.cc/h to webkit/child/webkit_child_helpers.
I added an include rule to content\common\DEPS to allow including
webkit\child\websocketstreamhandle_delegate.h. This will be removed in a
followup.
TBR=jam@chromium.org, jamesr@chromium.org, jschuh@chromium.org
BUG=237249
Review URL: https://codereview.chromium.org/19673002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/tools')
| -rw-r--r-- | android_webview/tools/third_party_files_whitelist.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/tools/third_party_files_whitelist.txt b/android_webview/tools/third_party_files_whitelist.txt index bc5ad88..190bcb6 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -186,13 +186,13 @@ webkit/browser/appcache/manifest_parser.cc # code is taken from WebKit, the license for which we already pick up from # webkit/. webkit/browser/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 +webkit/child/multipart_response_delegate.h +# Copyright Tim Copperfield and Christian Dywan; LGPL license. Not used on +# Android. +webkit/common/cursors/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 |