diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 05:32:02 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 05:32:02 +0000 |
| commit | 1f9cdd607fffa2961f3fea926f8f896e1029bdfb (patch) | |
| tree | 46e473fe7a6971d34dd9a71168a765247cd8de59 /android_webview/tools | |
| parent | fd8e98a75d9897f7fb49b62847910a1dde117165 (diff) | |
| download | chromium_src-1f9cdd607fffa2961f3fea926f8f896e1029bdfb.zip chromium_src-1f9cdd607fffa2961f3fea926f8f896e1029bdfb.tar.gz chromium_src-1f9cdd607fffa2961f3fea926f8f896e1029bdfb.tar.bz2 | |
Move simple png encoding for image_diff into tools/
Now that Blink isn't including webkit_support_gfx directly, this moves
it to live next to its only user (the image_diff tool).
R=dpranke
TBR=joth (for android_webview/tools/third_party_files_whitelist.txt)
Review URL: https://chromiumcodereview.appspot.com/21202003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/tools')
| -rw-r--r-- | android_webview/tools/third_party_files_whitelist.txt | 6 |
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 190bcb6..8438515 100644 --- a/android_webview/tools/third_party_files_whitelist.txt +++ b/android_webview/tools/third_party_files_whitelist.txt @@ -147,6 +147,9 @@ net/socket/ssl_client_socket_nss.cc skia/config/SkUserConfig.h # Contains word 'copyright' in comments. tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py +# This third-party code is taken from Mozilla, but is copyright Google and has +# been re-licensed under the Chromium license. +tools/imagediff/image_diff_png.cc # Copyright Ero Carrera; BSD license. Tool only. tools/symsrc/pefile.py # Copyright The Chromium Authors, Sun Microsystems Inc, the V8 project authors; @@ -193,9 +196,6 @@ 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 # Copyright Apple, Inc, Graham Dennis and Eric Seidel; BSD license. Tool only webkit/support/mac/DumpRenderTreePasteboard.h # Copyright Apple, Inc, Graham Dennis and Eric Seidel; BSD license. Tool only |