Skip to content

Commit

Permalink
Merge branch 'chromium_upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hodduc
hodduc committed Mar 11, 2016
2 parents 6b2a465 + 1ac7395 commit 31ca8e7
Show file tree
Hide file tree
Showing 305 changed files with 27,155 additions and 6,954 deletions.
48 changes: 37 additions & 11 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ set(
src/net/quic/quic_socket_address_coder.cc
src/net/quic/quic_utils.cc
src/net/quic/quic_frame_list.cc
src/net/quic/spdy_utils.cc
src/net/quic/crypto/quic_crypto_server_config.cc
src/net/quic/crypto/crypto_handshake_message.cc
src/net/quic/crypto/p256_key_exchange_openssl.cc
Expand Down Expand Up @@ -122,21 +123,23 @@ set(
src/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc
src/net/quic/crypto/quic_encrypter.cc
src/net/quic/crypto/quic_crypto_client_config.cc
src/net/quic/crypto/proof_source.cc
src/net/quic/quic_clock.cc
src/net/quic/quic_alarm.cc
src/net/quic/quic_sent_entropy_manager.cc
src/net/quic/congestion_control/pacing_sender.cc
src/net/quic/congestion_control/time_loss_algorithm.cc
src/net/quic/congestion_control/loss_detection_interface.cc
src/net/quic/congestion_control/general_loss_algorithm.cc
src/net/quic/congestion_control/send_algorithm_interface.cc
src/net/quic/congestion_control/cubic.cc
src/net/quic/congestion_control/cubic_bytes.cc
src/net/quic/congestion_control/tcp_loss_algorithm.cc
src/net/quic/congestion_control/prr_sender.cc
src/net/quic/congestion_control/tcp_cubic_sender.cc
src/net/quic/congestion_control/hybrid_slow_start.cc
src/net/quic/congestion_control/rtt_stats.cc
src/net/quic/congestion_control/tcp_cubic_sender.cc
src/net/quic/congestion_control/tcp_cubic_sender_base.cc
src/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
src/net/quic/congestion_control/tcp_cubic_sender_packets.cc
src/net/quic/congestion_control/tcp_cubic_bytes_sender.cc
src/net/quic/quic_config.cc
src/net/quic/quic_crypto_server_stream.cc
Expand All @@ -147,6 +150,8 @@ set(
src/net/quic/quic_packet_creator.cc
src/net/quic/quic_sustained_bandwidth_recorder.cc
src/net/quic/quic_client_session_base.cc
src/net/quic/quic_client_promised_info.cc
src/net/quic/quic_client_push_promise_index.cc
src/net/quic/quic_crypto_client_stream.cc
src/net/quic/quic_server_id.cc
src/net/quic/quic_simple_buffer_allocator.cc
Expand All @@ -155,13 +160,16 @@ set(
src/net/quic/stream_sequencer_buffer.cc

src/net/base/int128.cc
src/net/base/escape.cc
src/net/base/io_buffer.cc
src/net/base/net_util.cc
src/net/base/net_errors.cc
src/net/base/ip_address.cc
src/net/base/ip_address_number.cc
src/net/base/ip_endpoint.cc
src/net/base/host_port_pair.cc
src/net/base/port_util.cc
src/net/base/address_family.cc
src/net/base/port_util.cc
src/net/base/url_util.cc

src/net/spdy/spdy_frame_reader.cc
src/net/spdy/spdy_frame_builder.cc
Expand All @@ -175,6 +183,7 @@ set(
src/net/spdy/hpack/hpack_entry.cc
src/net/spdy/hpack/hpack_header_table.cc
src/net/spdy/hpack/hpack_huffman_table.cc
src/net/spdy/hpack/hpack_huffman_decoder.cc
src/net/spdy/hpack/hpack_input_stream.cc
src/net/spdy/hpack/hpack_output_stream.cc
src/net/spdy/hpack/hpack_static_table.cc
Expand Down Expand Up @@ -256,6 +265,7 @@ set(
src/base/strings/string16.cc
src/base/strings/utf_string_conversion_utils.cc
src/base/strings/utf_string_conversions.cc
src/base/strings/utf_offset_string_conversions.cc
src/base/pickle.cc
src/base/debug/alias.cc
src/base/debug/stack_trace.cc
Expand All @@ -269,7 +279,6 @@ set(
src/base/lazy_instance.cc
src/base/callback_internal.cc
src/base/base_switches.cc
src/base/os_compat_nacl.cc
src/base/values.cc
src/base/at_exit.cc
src/base/process/process_handle_posix.cc
Expand All @@ -279,14 +288,16 @@ set(
src/base/base64.cc
src/base/md5.cc
src/base/metrics/statistics_recorder.cc
src/base/metrics/histogram_base.cc
src/base/metrics/sample_map.cc
src/base/metrics/histogram.cc
src/base/metrics/sample_vector.cc
src/base/metrics/histogram_base.cc
src/base/metrics/histogram.cc
src/base/metrics/histogram_persistence.cc
src/base/metrics/histogram_samples.cc
src/base/metrics/bucket_ranges.cc
src/base/metrics/sparse_histogram.cc
src/base/metrics/bucket_ranges.cc
src/base/metrics/metrics_hashes.cc
src/base/metrics/persistent_memory_allocator.cc
src/base/rand_util.cc
src/base/files/file_path_constants.cc
src/base/files/file_path.cc
Expand Down Expand Up @@ -318,6 +329,23 @@ set(
URL_SOURCES

src/url/url_constants.cc
src/url/url_canon_etc.cc
src/url/url_canon_filesystemurl.cc
src/url/url_canon_fileurl.cc
src/url/url_canon_host.cc
src/url/url_canon_internal.cc
src/url/url_canon_ip.cc
src/url/url_canon_mailtourl.cc
src/url/url_canon_path.cc
src/url/url_canon_pathurl.cc
src/url/url_canon_query.cc
src/url/url_canon_relative.cc
src/url/url_canon_stdstring.cc
src/url/url_canon_stdurl.cc
src/url/url_util.cc
src/url/url_parse_file.cc
src/url/gurl.cc
src/url/third_party/mozilla/url_parse.cc
)

add_library(
Expand All @@ -329,8 +357,6 @@ add_library(
${CRYPTO_SOURCES}
${URL_SOURCES}

src/stubs.cc

src/third_party/modp_b64/modp_b64.cc
src/third_party/zlib/gzwrite.c
src/third_party/zlib/crc32.c
Expand Down
57 changes: 37 additions & 20 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@

# START #
{
"chromium_revision": "b25d2d936da7620ff44ce4a2952f38402efad685",
"chromium_revision": "6e3a05d6080ba6ae25af2835573ff9e2406b90c0",
"automatic_dependency": [
{
"from": "net/quic/quic_connection.cc",
"exclude": [
"cached_network_parameters.pb.h",
"net/base/net_util.h",
"base/debug/debugger.h",
"base/sequence_checker.h",
"base/files/file.h"
"base/files/file.h",
"base/feature_list.h",
"net/base/registry_controlled_domains/registry_controlled_domain.h",
"base/metrics/field_trial.h"
]
},
{
Expand Down Expand Up @@ -45,19 +47,20 @@
"from": "net/quic/quic_session.cc",
"exclude": [
"cached_network_parameters.pb.h",
"net/base/net_util.h",
"base/debug/debugger.h",
"base/sequence_checker.h",
"base/files/file.h",
"net/ssl/ssl_info.h",
"net/spdy/spdy_header_block.h"
"net/spdy/spdy_header_block.h",
"base/feature_list.h",
"net/base/registry_controlled_domains/registry_controlled_domain.h",
"base/metrics/field_trial.h"
]
},
{
"from": "net/quic/quic_client_session_base.cc",
"exclude": [
"cached_network_parameters.pb.h",
"net/base/net_util.h",
"base/debug/debugger.h",
"base/sequence_checker.h",
"base/files/file.h",
Expand All @@ -66,14 +69,16 @@
"net/ssl/ssl_info.h",
"net/spdy/spdy_header_block.h",
"base/cpu.h",
"net/base/host_port_pair.h"
"net/base/host_port_pair.h",
"base/feature_list.h",
"net/base/registry_controlled_domains/registry_controlled_domain.h",
"base/metrics/field_trial.h"
]
},
{
"from": "net/quic/quic_crypto_client_stream.cc",
"exclude": [
"cached_network_parameters.pb.h",
"net/base/net_util.h",
"base/debug/debugger.h",
"base/sequence_checker.h",
"base/files/file.h",
Expand All @@ -82,15 +87,17 @@
"net/ssl/ssl_info.h",
"net/spdy/spdy_header_block.h",
"base/cpu.h",
"net/base/host_port_pair.h"
"net/base/host_port_pair.h",
"base/feature_list.h",
"net/base/registry_controlled_domains/registry_controlled_domain.h",
"base/metrics/field_trial.h"
]
},
{
"from": "net/quic/quic_crypto_server_stream.cc",
"exclude": [
"cached_network_parameters.pb.h",
"source_address_token.pb.h",
"net/base/net_util.h",
"base/debug/debugger.h",
"base/sequence_checker.h",
"base/files/file.h",
Expand All @@ -99,7 +106,10 @@
"net/spdy/spdy_header_block.h",
"modp_b64.h",
"modp_b64_data.h",
"base/cpu.h"
"base/cpu.h",
"base/feature_list.h",
"net/base/registry_controlled_domains/registry_controlled_domain.h",
"base/metrics/field_trial.h"
]
},
{
Expand Down Expand Up @@ -159,12 +169,11 @@
"base/synchronization/condition_variable.h",
"base/synchronization/condition_variable_posix.cc",
"base/files/file_path_constants.cc",
"base/files/file_util_posix.cc",
"base/process/process_handle_posix.cc",
"net/base/io_buffer.h",
"net/base/io_buffer.cc",
"net/base/completion_callback.h",
"net/base/net_util.h",
"net/base/net_util.cc",
"net/base/host_port_pair.h",
"net/base/host_port_pair.cc",
"net/quic/quic_simple_buffer_allocator.h",
Expand Down Expand Up @@ -211,8 +220,6 @@
"crypto/secure_hash_default.cc",
"crypto/curve25519-donna.c",
"crypto/curve25519_openssl.cc",
"crypto/ghash.cc",
"crypto/ghash.h",
"base/memory/scoped_vector.h",
"third_party/modp_b64/modp_b64_data.h",
"base/mac/mach_logging.cc",
Expand All @@ -221,11 +228,14 @@
"base/mac/scoped_mach_port.h",
"base/scoped_generic.h",
"base/time/time_mac.cc",
"base/feature_list.h",
"third_party/zlib/*.c",
"third_party/zlib/*.h",
"crypto/third_party/nss/*.c",
"crypto/third_party/nss/*.cc",
"crypto/third_party/nss/*.h"
"crypto/third_party/nss/*.h",
"url/url_canon_*.cc",
"url/url_parse_file.cc"
]
},
{
Expand All @@ -245,12 +255,19 @@
}
],
"patches": [
"patch/basepatch.patch",
"patch/freebsd.patch"
"patch/disable_sequence_checker.patch",
"patch/net_errors_remove_file_error.patch",
"patch/quic_session_remove_unused_include.patch",
"patch/pickle_remove_unused_include.patch",
"patch/platform_thread_remove_tracked_objects.patch",
"patch/rand_util_posix.patch",
"patch/persistent_memory_allocator_disable_sharing.patch",
"patch/spdy_header_block_remove_unused_callback.patch",
"patch/url_canon_host_disable_idn_host.patch",
"patch/url_util_remove_unused_function.patch",
"patch/disable_stack_trace.patch"
],
"custom_files": [
{"from": "custom/net_util.h", "to": "net/base/net_util.h"},
{"from": "custom/net_util.cc", "to": "net/base/net_util.cc"},
{"from": "custom/debugger.h", "to": "base/debug/debugger.h"},
{"from": "custom/debugger.cc", "to": "base/debug/debugger.cc"},
{"from": "custom/stubs.cc", "to": "stubs.cc"}
Expand Down
Loading

0 comments on commit 31ca8e7

Please sign in to comment.