Skip to content

GitLab

Commit d0247b1b authored by Torne (Richard Coles)'s avatar Torne (Richard Coles)
Browse files

Merge from Chromium at DEPS revision 224184 

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
parent f7571f5f
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 77 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
Plain diff Email patch
.DEPS.git
View file @ d0247b1b
......@@ -11,12 +11,12 @@ vars = {
'git_url':
'https://chromium.googlesource.com',
'webkit_rev':
'@731a7a437b033bd16250edd5ada2df404f4e0d1e'
'@dbcf41b256f5fe999b2091f7b739a4cd70b466cb'
}
deps = {
'src/breakpad/src':
Var('git_url') + '/external/google-breakpad/src.git@09225f6763d1faff892cd71fcd18da27b2ba1c2d',
Var('git_url') + '/external/google-breakpad/src.git@f753127663fb164b0b61a147cb93bbca496e1166',
'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin':
Var('git_url') + '/native_client/src/native_client/tests/prebuilt.git@3e17365176c94624f46cace174f61834b7f3c35d',
'src/chrome/test/data/perf/canvas_bench':
......@@ -28,7 +28,7 @@ deps = {
'src/media/cdm/ppapi/api':
Var('git_url') + '/chromium/cdm.git@c2b192a02546916d28233cfd8b7717ffcdcc8347',
'src/native_client':
Var('git_url') + '/native_client/src/native_client.git@10b23dec65dec0ecc7e105f4f09191f4c7876431',
Var('git_url') + '/native_client/src/native_client.git@9dd875a9429e98c7fcb216354b5893791663a512',
'src/sdch/open-vcdiff':
Var('git_url') + '/external/open-vcdiff.git@438f2a5be6d809bc21611a94cd37bfc8c28ceb33',
'src/testing/gmock':
......@@ -46,17 +46,17 @@ deps = {
'src/third_party/cacheinvalidation/src':
Var('git_url') + '/external/google-cache-invalidation-api/src.git@1ea5629c3d190998a24a14ffb58193e109b71855',
'src/third_party/cld_2/src':
Var('git_url') + '/external/cld2.git@effa708a7fd10b12b2c7bb5be019d15341fb2702',
Var('git_url') + '/external/cld2.git@b17c3c025db379fbeb56c4215bc1eb8737576f4c',
'src/third_party/ffmpeg':
Var('git_url') + '/chromium/third_party/ffmpeg.git' + Var('ffmpeg_hash'),
'src/third_party/flac':
Var('git_url') + '/chromium/deps/flac.git@92306ca4073ee0a9df9dc4a87e40a7b3fd595d02',
Var('git_url') + '/chromium/deps/flac.git@71e33f190a7bb144fe4e2014897b8d15c8247198',
'src/third_party/hunspell':
Var('git_url') + '/chromium/deps/hunspell.git@37403978cd939a2b396a5d49944af54623e4795e',
'src/third_party/hunspell_dictionaries':
Var('git_url') + '/chromium/deps/hunspell_dictionaries.git@bc7edb352e97fa71e387b9a5522f1bbd5b11a5eb',
'src/third_party/icu':
Var('git_url') + '/chromium/deps/icu46.git@6c837760feb38bc3d489542d1d430feec960cf6c',
Var('git_url') + '/chromium/deps/icu46.git@4f6674fff46d64372efed0c77ada6bb6b15d219d',
'src/third_party/jsoncpp/source/include':
Var('git_url') + '/external/jsoncpp/jsoncpp/include.git@b0dd48e02b6e6248328db78a65b5c601f150c349',
'src/third_party/jsoncpp/source/src/lib_json':
......@@ -66,7 +66,7 @@ deps = {
'src/third_party/libexif/sources':
Var('git_url') + '/chromium/deps/libexif/sources.git@d815c325bab0d1871d4c7e70600ecdfdab07db9e',
'src/third_party/libjingle/source/talk':
Var('git_url') + '/external/webrtc/stable/talk.git@0576e38c4676b0d13ef617d2093a0bcd6f2bc2a7',
Var('git_url') + '/external/webrtc/stable/talk.git@c7b37163b72221c0fdee4817c208b1e5be01ac05',
'src/third_party/libjpeg_turbo':
Var('git_url') + '/chromium/deps/libjpeg_turbo.git@82ce8a6d4ebe12a177c0c3597192f2b4f09e81c3',
'src/third_party/libphonenumber/src/phonenumbers':
......@@ -100,11 +100,11 @@ deps = {
'src/third_party/sfntly/cpp/src':
Var('git_url') + '/external/sfntly/cpp/src.git@cfb2f1743f0169ad8d01035458617bce97107539',
'src/third_party/skia/gyp':
Var('git_url') + '/external/skia/gyp.git@28877decd2e832479787235bed64783368196e42',
Var('git_url') + '/external/skia/gyp.git@6392aedb77275fe788f1062541c0bcaee4295eb6',
'src/third_party/skia/include':
Var('git_url') + '/external/skia/include.git@f2febcc07f11d5ba51a9489258519a1d4d11b51f',
Var('git_url') + '/external/skia/include.git@34db20f8f70d8e6673b3982be356d6fe895db5ba',
'src/third_party/skia/src':
Var('git_url') + '/external/skia/src.git@d36543342d0894e354fe82caa73542bb417bcf1c',
Var('git_url') + '/external/skia/src.git@9db1c1da3b9ce27de89476002fcec98d2648a263',
'src/third_party/smhasher/src':
Var('git_url') + '/external/smhasher.git@6f63a4882e6b2cf87e8eec1a3ef8644e0d963283',
'src/third_party/snappy/src':
......@@ -114,7 +114,7 @@ deps = {
'src/third_party/swig/Lib':
Var('git_url') + '/chromium/deps/swig/Lib.git@549f0b084ad9c40ef42d111303d831eb8d91252e',
'src/third_party/trace-viewer':
Var('git_url') + '/external/trace-viewer.git@b9331aa8d7beb41538b38acd01bfd4ac0ebe2362',
Var('git_url') + '/external/trace-viewer.git@526e3f104457c665907ebf12e4d19aba19c84952',
'src/third_party/usrsctp/usrsctplib':
Var('git_url') + '/external/usrsctplib.git@ec8cbf0c740353314c289a5bc87a7538e2af08bf',
'src/third_party/webdriver/pylib':
......@@ -124,7 +124,7 @@ deps = {
'src/third_party/webpagereplay':
Var('git_url') + '/external/web-page-replay.git@4bb19b79437f638749383e180f44722637c1aa65',
'src/third_party/webrtc':
Var('git_url') + '/external/webrtc/stable/webrtc.git@e0aea565841ca3e38293ee673d3e5ba21e109d5f',
Var('git_url') + '/external/webrtc/stable/webrtc.git@decf093c57969393ac866d8ddf83107f8e3621e2',
'src/third_party/yasm/source/patched-yasm':
Var('git_url') + '/chromium/deps/yasm/patched-yasm.git@c960eb11ccda80b10ed50be39df4f0663b371d1d',
'src/tools/deps2git':
......@@ -132,20 +132,20 @@ deps = {
'src/tools/grit':
Var('git_url') + '/external/grit-i18n.git@11e589a0b4a958ad1b5411692ee576cbee9f6ca5',
'src/tools/gyp':
Var('git_url') + '/external/gyp.git@b53892d170417249d33c6d70e1be6c81fcf77d85',
Var('git_url') + '/external/gyp.git@1f8c75bbcc90457341ed1cb8cb10525b7779a4fe',
'src/tools/page_cycler/acid3':
Var('git_url') + '/chromium/deps/acid3.git@6be0a66a1ebd7ebc5abc1b2f405a945f6d871521',
'src/tools/swarm_client':
Var('git_url') + '/chromium/tools/swarm_client.git@0f08cb80f1a07c71187cea80ff6baf2b400b2ede',
'src/v8':
Var('git_url') + '/external/v8.git@c5d4971574b7a205fa0e788d8121dc79485e5e67',
Var('git_url') + '/external/v8.git@4844ec2010ae872691d16199d0a685870c04bd9b',
}
deps_os = {
'android':
{
'src/third_party/android_tools':
Var('git_url') + '/android_tools.git@d8a5bfea861dfbacd9a74275c00561f7bb27d6e3',
Var('git_url') + '/android_tools.git@53862978424412e190e9bc40c7637a71fdd7d298',
'src/third_party/aosp':
Var('git_url') + '/chromium/deps/aosp.git@bbafe5155dff86bbba1e92b42a073ffcfcfbf28c',
'src/third_party/apache-mime4j':
......@@ -220,7 +220,7 @@ deps_os = {
'src/third_party/libyuv':
None,
'src/third_party/nss':
Var('git_url') + '/chromium/deps/nss.git@7594a137c0cfa074fc34c5beafe62af7427a4cbb',
Var('git_url') + '/chromium/deps/nss.git@6c8f5f52d485d7e47c16a533fd6c91657e918320',
'src/third_party/ots':
None,
'src/third_party/pylib':
......@@ -271,7 +271,7 @@ deps_os = {
'src/third_party/lighttpd':
Var('git_url') + '/chromium/deps/lighttpd.git@9dfa55d15937a688a92cbf2b7a8621b0927d06eb',
'src/third_party/nss':
Var('git_url') + '/chromium/deps/nss.git@7594a137c0cfa074fc34c5beafe62af7427a4cbb',
Var('git_url') + '/chromium/deps/nss.git@6c8f5f52d485d7e47c16a533fd6c91657e918320',
'src/third_party/pdfsqueeze':
Var('git_url') + '/external/pdfsqueeze.git@5936b871e6a087b7e50d4cbcb122378d8a07499f',
'src/third_party/swig/mac':
......@@ -329,7 +329,7 @@ deps_os = {
'src/third_party/nacl_sdk_binaries':
Var('git_url') + '/chromium/deps/nacl_sdk_binaries.git@759dfca03bdc774da7ecbf974f6e2b84f43699a5',
'src/third_party/nss':
Var('git_url') + '/chromium/deps/nss.git@7594a137c0cfa074fc34c5beafe62af7427a4cbb',
Var('git_url') + '/chromium/deps/nss.git@6c8f5f52d485d7e47c16a533fd6c91657e918320',
'src/third_party/pefile':
Var('git_url') + '/external/pefile.git@d0ca75794f69f1d09fd6d31d40ba2f1e9b3b7fb4',
'src/third_party/perl':
......
.gitignore
View file @ d0247b1b
......@@ -35,26 +35,28 @@
.pydevproject
# Settings directory for eclipse
/.settings
cscope.*
Session.vim
tags
Thumbs.db
v8.log
/Makefile
/_out
/arm-sysroot
/base/base_unittests_run.xml
/breakpad/src/
/build/Debug
/build/Debug_x64
/build/Release
/build/Release_x64
/build/gomacc.lock
/build/ipch/
/build/Release
/build/Release_x64
/build/util/LASTCHANGE*
/build/util/support
/build/x64/
# The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
/c
/ceee/internal/
/base/base_unittests_run.xml
/chrome/app/policy/chrome_settings_proto_compile.xml
/chrome/app/policy/chrome_settings_proto_generated_compile.xml
/chrome/app/policy/cloud_policy_backend_header_compile.xml
......@@ -87,6 +89,7 @@ v8.log
/chrome/installer/mini_installer/mini_installer.aps
/chrome/installer/mini_installer/support
/chrome/installer/mini_installer_syzygy.xml
/chrome/installer/mini_installer_tests_run.xml
/chrome/installer_util_strings.xml
/chrome/interactive_ui_tests_run.xml
/chrome/setup.xml
......@@ -121,6 +124,7 @@ v8.log
/chrome_frame/chrome_frame_version_resources.xml
/chrome_frame/tools/test/reference_build
/cloud_print/cloud_print_version_resources.xml
/components/variations.xml
/content/test/data/layout_tests/
/content/test/data/plugin/
/data
......@@ -176,6 +180,7 @@ v8.log
/third_party/adobe/flash/symbols
/third_party/amd/
/third_party/android_tools/
/third_party/android_tools_internal/
/third_party/angle_dx11
/third_party/aosp
/third_party/apache-mime4j
......@@ -324,5 +329,3 @@ v8.log
/win8/metro_driver/metro_driver_version_resources.xml
/x86-generic_out/
/xcodebuild
cscope.*
Session.vim
AUTHORS
View file @ d0247b1b
......@@ -53,7 +53,6 @@ Clemens Fruhwirth <clemens@endorphin.org>
Clement Scheelfeldt Skau <clementskau@gmail.com>
Clinton Staley <clintstaley@chromium.org>
Clinton Staley <clintstaley@gmail.com>
Code Aurora Forum <*@codeaurora.org>
Craig Schlenter <craig.schlenter@gmail.com>
Dai Chunyang <chunyang.dai@intel.com>
Daniel Nishi <dhnishi@gmail.com>
......@@ -283,7 +282,6 @@ Xinchao He <hexinchao@gmail.com>
Xu Samuel <samuel.xu@intel.com>
Yael Aharon <yael.aharon@intel.com>
Yair Yogev <progame@chromium.org>
Yandex LLC <*@yandex-team.ru>
Yang Gu <yang.gu@intel.com>
Yarin Kaul <yarin.kaul@gmail.com>
Yoav Zilberberg <yoav.zilberberg@gmail.com>
......@@ -297,6 +295,7 @@ Zeno Albisser <zeno.albisser@digia.com>
Zheng Chuang <zhengchuangscu@gmail.com>
方觉 (Fang Jue) <fangjue23303@gmail.com>
Code Aurora Forum <*@codeaurora.org>
Comodo CA Limited
Google Inc. <*@google.com>
NVIDIA Corporation <*@nvidia.com>
......@@ -304,3 +303,5 @@ Opera Software ASA <*@opera.com>
The Chromium Authors <*@chromium.org>
The MathWorks, Inc. <binod.pant@mathworks.com>
Torchmobile Inc.
Venture 3 Systems LLC <*@venture3systems.com>
Yandex LLC <*@yandex-team.ru>
DEPS
View file @ d0247b1b
......@@ -8,12 +8,12 @@ vars = {
"sourceforge_url": "http://svn.code.sf.net/p/%(repo)s/code",
"webkit_trunk": "http://src.chromium.org/blink/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
"webkit_revision": "157646",
"webkit_revision": "158008",
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"skia_git": "https://skia.googlesource.com",
"swig_revision": "69281",
"nacl_revision": "12146",
"nacl_revision": "12177",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "11437", # native_client/DEPS: tools_rev
......@@ -29,18 +29,18 @@ vars = {
"ffmpeg_hash": "feb5bc7d3d1fc66d9c52dc316479231b02cbdac1",
"sfntly_revision": "134",
"skia_revision": "11190",
"skia_hash": "d99d102dd27d7acca1bbc16884a1a5719fef2568",
"skia_revision": "11364",
"skia_hash": "8249a2fc66738fd4aeb2500aae50c20744f1a744",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
"v8_revision": "16634",
"v8_revision": "16802",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
"webrtc_revision": "4699",
"webrtc_revision": "4758",
"jsoncpp_revision": "248",
"nss_revision": "220375",
"nss_revision": "223139",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarm_client
# and whatever else without interference from each other.
......@@ -53,7 +53,7 @@ vars = {
deps = {
"src/breakpad/src":
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@1211",
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@1213",
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
......@@ -69,13 +69,13 @@ deps = {
"/external/angle.git@fc75e21762459c9306fd0c0a060010254d5ad248",
"src/third_party/trace-viewer":
(Var("googlecode_url") % "trace-viewer") + "/trunk@942",
(Var("googlecode_url") % "trace-viewer") + "/trunk@1003",
"src/third_party/WebKit":
Var("webkit_trunk") + "@" + Var("webkit_revision"),
"src/third_party/icu":
"/trunk/deps/third_party/icu46@219032",
"/trunk/deps/third_party/icu46@223384",
"src/third_party/libexif/sources":
"/trunk/deps/third_party/libexif/sources@146817",
......@@ -103,7 +103,7 @@ deps = {
(Var("googlecode_url") % "grit-i18n") + "/trunk@136",
"src/tools/gyp":
(Var("googlecode_url") % "gyp") + "/trunk@1722",
(Var("googlecode_url") % "gyp") + "/trunk@1735",
"src/tools/swarm_client":
"/trunk/tools/swarm_client@" + Var("swarm_revision"),
......@@ -190,7 +190,7 @@ deps = {
"/trunk/deps/third_party/libjpeg_turbo@177737",
"src/third_party/flac":
"/trunk/deps/third_party/flac@198139",
"/trunk/deps/third_party/flac@222897",
"src/third_party/pyftpdlib/src":
(Var("googlecode_url") % "pyftpdlib") + "/trunk@977",
......@@ -251,7 +251,7 @@ deps = {
"/trunk/deps/third_party/mesa@210110",
"src/third_party/cld_2/src":
(Var("googlecode_url") % "cld2") + "/trunk@75",
(Var("googlecode_url") % "cld2") + "/trunk@84",
}
......@@ -456,7 +456,7 @@ deps_os = {
"android": {
"src/third_party/android_tools":
Var("chromium_git") + "/android_tools.git" +
"@d8a5bfea861dfbacd9a74275c00561f7bb27d6e3",
"@53862978424412e190e9bc40c7637a71fdd7d298",
"src/third_party/aosp":
"/trunk/deps/third_party/aosp@148330",
......
GypAndroid.darwin-arm.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.darwin-arm.mk
include $(LOCAL_PATH)/ipc/ipc.target.darwin-arm.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.darwin-arm.mk
include $(LOCAL_PATH)/media/media.target.darwin-arm.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.darwin-arm.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.darwin-arm.mk
include $(LOCAL_PATH)/media/player_android.target.darwin-arm.mk
include $(LOCAL_PATH)/media/shared_memory_support.target.darwin-arm.mk
......@@ -100,9 +101,8 @@ include $(LOCAL_PATH)/skia/skia_opts_neon.target.darwin-arm.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-arm.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.darwin-arm.mk
......
GypAndroid.darwin-mips.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.darwin-mips.mk
include $(LOCAL_PATH)/ipc/ipc.target.darwin-mips.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.darwin-mips.mk
include $(LOCAL_PATH)/media/media.target.darwin-mips.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.darwin-mips.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.darwin-mips.mk
include $(LOCAL_PATH)/media/player_android.target.darwin-mips.mk
include $(LOCAL_PATH)/media/shared_memory_support.target.darwin-mips.mk
......@@ -97,9 +98,8 @@ include $(LOCAL_PATH)/skia/skia_opts.target.darwin-mips.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-mips.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.darwin-mips.mk
......
GypAndroid.darwin-x86.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.darwin-x86.mk
include $(LOCAL_PATH)/ipc/ipc.target.darwin-x86.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.darwin-x86.mk
include $(LOCAL_PATH)/media/media.target.darwin-x86.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.darwin-x86.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.darwin-x86.mk
include $(LOCAL_PATH)/media/media_asm.target.darwin-x86.mk
include $(LOCAL_PATH)/media/media_mmx.target.darwin-x86.mk
......@@ -105,9 +106,8 @@ include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.darwin-x86.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.darwin-x86.mk
......
GypAndroid.linux-arm.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-arm.mk
include $(LOCAL_PATH)/ipc/ipc.target.linux-arm.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-arm.mk
include $(LOCAL_PATH)/media/media.target.linux-arm.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.linux-arm.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-arm.mk
include $(LOCAL_PATH)/media/player_android.target.linux-arm.mk
include $(LOCAL_PATH)/media/shared_memory_support.target.linux-arm.mk
......@@ -100,9 +101,8 @@ include $(LOCAL_PATH)/skia/skia_opts_neon.target.linux-arm.mk
include $(LOCAL_PATH)/sql/sql.target.linux-arm.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-arm.mk
......
GypAndroid.linux-mips.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-mips.mk
include $(LOCAL_PATH)/ipc/ipc.target.linux-mips.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-mips.mk
include $(LOCAL_PATH)/media/media.target.linux-mips.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.linux-mips.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-mips.mk
include $(LOCAL_PATH)/media/player_android.target.linux-mips.mk
include $(LOCAL_PATH)/media/shared_memory_support.target.linux-mips.mk
......@@ -97,9 +98,8 @@ include $(LOCAL_PATH)/skia/skia_opts.target.linux-mips.mk
include $(LOCAL_PATH)/sql/sql.target.linux-mips.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-mips.mk
......
GypAndroid.linux-x86.mk
View file @ d0247b1b
......@@ -73,6 +73,7 @@ include $(LOCAL_PATH)/gpu/gpu_ipc.target.linux-x86.mk
include $(LOCAL_PATH)/ipc/ipc.target.linux-x86.mk
include $(LOCAL_PATH)/jingle/jingle_glue.target.linux-x86.mk
include $(LOCAL_PATH)/media/media.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_android_imageformat_list.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_android_jni_headers.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_asm.target.linux-x86.mk
include $(LOCAL_PATH)/media/media_mmx.target.linux-x86.mk
......@@ -105,9 +106,8 @@ include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.linux-x86.mk
include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/deprecated_perl_bindings_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/interface_dependencies.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/python_bindings_sources.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/debugger_script_source.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/core/generate_inspector_protocol_version.target.linux-x86.mk
......
NOTICE
View file @ d0247b1b
......@@ -6963,28 +6963,6 @@ 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.
Copyright (c) 2004-2009 Sergey Lyubka
Portions Copyright (c) 2009 Gilbert Wellisch
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
Copyright 2010-2011, Google Inc.
All rights reserved.
......
WATCHLISTS
View file @ d0247b1b
......@@ -260,6 +260,9 @@
'file_manager|' \
'filebrowse'
},
'filesapp': {
'filepath': 'chrome/browser/resources/file_manager',
},
'ftp': {
'filepath': 'ftp',
},
......@@ -575,15 +578,21 @@
'ui/views/view.cc|'\
'ui/views/widget/',
},
'webkit': {
'filepath': 'webkit/',
},
'webrtc_media': {
'filepath': 'chrome/browser/media/|'\
'content/browser/renderer_host/media/|'\
'content/renderer/media/|'\
'media/video/capture/',
},
'website_settings': {
'filepath': 'chrome/browser/content_settings/'\
'|chrome/browser/ui/views/website_settings/'\
'|chrome/browser/ui/website_settings/'\
'|chrome/common/content_settings',
},
'webkit': {
'filepath': 'webkit/',
},
'worker': {
'filepath': 'chrome/browser/worker_host/|chrome/worker/|'\
'chrome/common/worker_messages|webkit/glue/webworker',
......@@ -689,6 +698,7 @@
'extensions-reviews@chromium.org'],
'fileapi': ['kinuko+watch@chromium.org', 'tzik+watch@chromium.org'],
'filebrowse': ['rginda+watch@chromium.org'],
'filesapp': ['mtomasz+watch@chromium.org'],
'ftp': ['phajdan.jr@chromium.org'],
'fullscreen_controller': ['scheib+watch@chromium.org'],
'geolocation': ['mvanouwerkerk@chromium.org'],
......@@ -794,8 +804,9 @@
'timurrrr+watch@chromium.org'],
'views': ['tfarina@chromium.org'],
'views_core': ['ben+watch@chromium.org'],
'website_settings': ['markusheintz@chromium.org'],
'webkit': ['darin-cc@chromium.org'],
'webrtc_media': ['wjia+watch@chromium.org'],
'website_settings': ['markusheintz@chromium.org'],
'worker': ['jam@chromium.org'],
'x11': ['derat+watch@chromium.org',
'sadrul@chromium.org',
......
android_webview/All.target.darwin-arm.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/All.target.darwin-mips.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/All.target.darwin-x86.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/All.target.linux-arm.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/All.target.linux-mips.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/All.target.linux-x86.mk
View file @ d0247b1b
......@@ -18,6 +18,7 @@ GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_page_transition_types_java_gyp)/page_transition_types_java.stamp \
$(call intermediates-dir-for,GYP,content_result_codes_java_gyp)/result_codes_java.stamp \
$(call intermediates-dir-for,GYP,content_speech_recognition_error_java_gyp)/speech_recognition_error_java.stamp \
$(call intermediates-dir-for,GYP,media_media_android_imageformat_list_gyp)/media_android_imageformat_list.stamp \
$(call intermediates-dir-for,GYP,net_certificate_mime_types_java_gyp)/certificate_mime_types_java.stamp \
$(call intermediates-dir-for,GYP,net_cert_verify_result_android_java_gyp)/cert_verify_result_android_java.stamp \
$(call intermediates-dir-for,GYP,net_net_errors_java_gyp)/net_errors_java.stamp \
......
android_webview/Android.mk
View file @ d0247b1b
......@@ -56,6 +56,7 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/base/MemoryPress
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/PageTransitionTypes.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/SpeechRecognitionError.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyResultAndroid.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
......
android_webview/all_webview.gyp
View file @ d0247b1b
......@@ -20,6 +20,7 @@
'../content/content.gyp:page_transition_types_java',
'../content/content.gyp:result_codes_java',
'../content/content.gyp:speech_recognition_error_java',
'../media/media.gyp:media_android_imageformat_list',
'../net/net.gyp:certificate_mime_types_java',
'../net/net.gyp:cert_verify_result_android_java',
'../net/net.gyp:net_errors_java',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment