Skip to content

Commit 31ca8e7

Browse files
hodduchodduc
committed
Merge branch 'chromium_upstream'
2 parents 6b2a465 + 1ac7395 commit 31ca8e7

305 files changed

Lines changed: 27155 additions & 6954 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ set(
9292
src/net/quic/quic_socket_address_coder.cc
9393
src/net/quic/quic_utils.cc
9494
src/net/quic/quic_frame_list.cc
95+
src/net/quic/spdy_utils.cc
9596
src/net/quic/crypto/quic_crypto_server_config.cc
9697
src/net/quic/crypto/crypto_handshake_message.cc
9798
src/net/quic/crypto/p256_key_exchange_openssl.cc
@@ -122,21 +123,23 @@ set(
122123
src/net/quic/crypto/aes_128_gcm_12_decrypter_openssl.cc
123124
src/net/quic/crypto/quic_encrypter.cc
124125
src/net/quic/crypto/quic_crypto_client_config.cc
126+
src/net/quic/crypto/proof_source.cc
125127
src/net/quic/quic_clock.cc
126128
src/net/quic/quic_alarm.cc
127129
src/net/quic/quic_sent_entropy_manager.cc
128130
src/net/quic/congestion_control/pacing_sender.cc
129-
src/net/quic/congestion_control/time_loss_algorithm.cc
130131
src/net/quic/congestion_control/loss_detection_interface.cc
131132
src/net/quic/congestion_control/general_loss_algorithm.cc
132133
src/net/quic/congestion_control/send_algorithm_interface.cc
133134
src/net/quic/congestion_control/cubic.cc
134135
src/net/quic/congestion_control/cubic_bytes.cc
135-
src/net/quic/congestion_control/tcp_loss_algorithm.cc
136136
src/net/quic/congestion_control/prr_sender.cc
137-
src/net/quic/congestion_control/tcp_cubic_sender.cc
138137
src/net/quic/congestion_control/hybrid_slow_start.cc
139138
src/net/quic/congestion_control/rtt_stats.cc
139+
src/net/quic/congestion_control/tcp_cubic_sender.cc
140+
src/net/quic/congestion_control/tcp_cubic_sender_base.cc
141+
src/net/quic/congestion_control/tcp_cubic_sender_bytes.cc
142+
src/net/quic/congestion_control/tcp_cubic_sender_packets.cc
140143
src/net/quic/congestion_control/tcp_cubic_bytes_sender.cc
141144
src/net/quic/quic_config.cc
142145
src/net/quic/quic_crypto_server_stream.cc
@@ -147,6 +150,8 @@ set(
147150
src/net/quic/quic_packet_creator.cc
148151
src/net/quic/quic_sustained_bandwidth_recorder.cc
149152
src/net/quic/quic_client_session_base.cc
153+
src/net/quic/quic_client_promised_info.cc
154+
src/net/quic/quic_client_push_promise_index.cc
150155
src/net/quic/quic_crypto_client_stream.cc
151156
src/net/quic/quic_server_id.cc
152157
src/net/quic/quic_simple_buffer_allocator.cc
@@ -155,13 +160,16 @@ set(
155160
src/net/quic/stream_sequencer_buffer.cc
156161

157162
src/net/base/int128.cc
163+
src/net/base/escape.cc
158164
src/net/base/io_buffer.cc
159-
src/net/base/net_util.cc
160165
src/net/base/net_errors.cc
166+
src/net/base/ip_address.cc
167+
src/net/base/ip_address_number.cc
161168
src/net/base/ip_endpoint.cc
162169
src/net/base/host_port_pair.cc
163-
src/net/base/port_util.cc
164170
src/net/base/address_family.cc
171+
src/net/base/port_util.cc
172+
src/net/base/url_util.cc
165173

166174
src/net/spdy/spdy_frame_reader.cc
167175
src/net/spdy/spdy_frame_builder.cc
@@ -175,6 +183,7 @@ set(
175183
src/net/spdy/hpack/hpack_entry.cc
176184
src/net/spdy/hpack/hpack_header_table.cc
177185
src/net/spdy/hpack/hpack_huffman_table.cc
186+
src/net/spdy/hpack/hpack_huffman_decoder.cc
178187
src/net/spdy/hpack/hpack_input_stream.cc
179188
src/net/spdy/hpack/hpack_output_stream.cc
180189
src/net/spdy/hpack/hpack_static_table.cc
@@ -256,6 +265,7 @@ set(
256265
src/base/strings/string16.cc
257266
src/base/strings/utf_string_conversion_utils.cc
258267
src/base/strings/utf_string_conversions.cc
268+
src/base/strings/utf_offset_string_conversions.cc
259269
src/base/pickle.cc
260270
src/base/debug/alias.cc
261271
src/base/debug/stack_trace.cc
@@ -269,7 +279,6 @@ set(
269279
src/base/lazy_instance.cc
270280
src/base/callback_internal.cc
271281
src/base/base_switches.cc
272-
src/base/os_compat_nacl.cc
273282
src/base/values.cc
274283
src/base/at_exit.cc
275284
src/base/process/process_handle_posix.cc
@@ -279,14 +288,16 @@ set(
279288
src/base/base64.cc
280289
src/base/md5.cc
281290
src/base/metrics/statistics_recorder.cc
282-
src/base/metrics/histogram_base.cc
283291
src/base/metrics/sample_map.cc
284-
src/base/metrics/histogram.cc
285292
src/base/metrics/sample_vector.cc
293+
src/base/metrics/histogram_base.cc
294+
src/base/metrics/histogram.cc
295+
src/base/metrics/histogram_persistence.cc
286296
src/base/metrics/histogram_samples.cc
287-
src/base/metrics/bucket_ranges.cc
288297
src/base/metrics/sparse_histogram.cc
298+
src/base/metrics/bucket_ranges.cc
289299
src/base/metrics/metrics_hashes.cc
300+
src/base/metrics/persistent_memory_allocator.cc
290301
src/base/rand_util.cc
291302
src/base/files/file_path_constants.cc
292303
src/base/files/file_path.cc
@@ -318,6 +329,23 @@ set(
318329
URL_SOURCES
319330

320331
src/url/url_constants.cc
332+
src/url/url_canon_etc.cc
333+
src/url/url_canon_filesystemurl.cc
334+
src/url/url_canon_fileurl.cc
335+
src/url/url_canon_host.cc
336+
src/url/url_canon_internal.cc
337+
src/url/url_canon_ip.cc
338+
src/url/url_canon_mailtourl.cc
339+
src/url/url_canon_path.cc
340+
src/url/url_canon_pathurl.cc
341+
src/url/url_canon_query.cc
342+
src/url/url_canon_relative.cc
343+
src/url/url_canon_stdstring.cc
344+
src/url/url_canon_stdurl.cc
345+
src/url/url_util.cc
346+
src/url/url_parse_file.cc
347+
src/url/gurl.cc
348+
src/url/third_party/mozilla/url_parse.cc
321349
)
322350

323351
add_library(
@@ -329,8 +357,6 @@ add_library(
329357
${CRYPTO_SOURCES}
330358
${URL_SOURCES}
331359

332-
src/stubs.cc
333-
334360
src/third_party/modp_b64/modp_b64.cc
335361
src/third_party/zlib/gzwrite.c
336362
src/third_party/zlib/crc32.c

‎DEPS‎

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
# START #
55
{
6-
"chromium_revision": "b25d2d936da7620ff44ce4a2952f38402efad685",
6+
"chromium_revision": "6e3a05d6080ba6ae25af2835573ff9e2406b90c0",
77
"automatic_dependency": [
88
{
99
"from": "net/quic/quic_connection.cc",
1010
"exclude": [
1111
"cached_network_parameters.pb.h",
12-
"net/base/net_util.h",
1312
"base/debug/debugger.h",
1413
"base/sequence_checker.h",
15-
"base/files/file.h"
14+
"base/files/file.h",
15+
"base/feature_list.h",
16+
"net/base/registry_controlled_domains/registry_controlled_domain.h",
17+
"base/metrics/field_trial.h"
1618
]
1719
},
1820
{
@@ -45,19 +47,20 @@
4547
"from": "net/quic/quic_session.cc",
4648
"exclude": [
4749
"cached_network_parameters.pb.h",
48-
"net/base/net_util.h",
4950
"base/debug/debugger.h",
5051
"base/sequence_checker.h",
5152
"base/files/file.h",
5253
"net/ssl/ssl_info.h",
53-
"net/spdy/spdy_header_block.h"
54+
"net/spdy/spdy_header_block.h",
55+
"base/feature_list.h",
56+
"net/base/registry_controlled_domains/registry_controlled_domain.h",
57+
"base/metrics/field_trial.h"
5458
]
5559
},
5660
{
5761
"from": "net/quic/quic_client_session_base.cc",
5862
"exclude": [
5963
"cached_network_parameters.pb.h",
60-
"net/base/net_util.h",
6164
"base/debug/debugger.h",
6265
"base/sequence_checker.h",
6366
"base/files/file.h",
@@ -66,14 +69,16 @@
6669
"net/ssl/ssl_info.h",
6770
"net/spdy/spdy_header_block.h",
6871
"base/cpu.h",
69-
"net/base/host_port_pair.h"
72+
"net/base/host_port_pair.h",
73+
"base/feature_list.h",
74+
"net/base/registry_controlled_domains/registry_controlled_domain.h",
75+
"base/metrics/field_trial.h"
7076
]
7177
},
7278
{
7379
"from": "net/quic/quic_crypto_client_stream.cc",
7480
"exclude": [
7581
"cached_network_parameters.pb.h",
76-
"net/base/net_util.h",
7782
"base/debug/debugger.h",
7883
"base/sequence_checker.h",
7984
"base/files/file.h",
@@ -82,15 +87,17 @@
8287
"net/ssl/ssl_info.h",
8388
"net/spdy/spdy_header_block.h",
8489
"base/cpu.h",
85-
"net/base/host_port_pair.h"
90+
"net/base/host_port_pair.h",
91+
"base/feature_list.h",
92+
"net/base/registry_controlled_domains/registry_controlled_domain.h",
93+
"base/metrics/field_trial.h"
8694
]
8795
},
8896
{
8997
"from": "net/quic/quic_crypto_server_stream.cc",
9098
"exclude": [
9199
"cached_network_parameters.pb.h",
92100
"source_address_token.pb.h",
93-
"net/base/net_util.h",
94101
"base/debug/debugger.h",
95102
"base/sequence_checker.h",
96103
"base/files/file.h",
@@ -99,7 +106,10 @@
99106
"net/spdy/spdy_header_block.h",
100107
"modp_b64.h",
101108
"modp_b64_data.h",
102-
"base/cpu.h"
109+
"base/cpu.h",
110+
"base/feature_list.h",
111+
"net/base/registry_controlled_domains/registry_controlled_domain.h",
112+
"base/metrics/field_trial.h"
103113
]
104114
},
105115
{
@@ -159,12 +169,11 @@
159169
"base/synchronization/condition_variable.h",
160170
"base/synchronization/condition_variable_posix.cc",
161171
"base/files/file_path_constants.cc",
172+
"base/files/file_util_posix.cc",
162173
"base/process/process_handle_posix.cc",
163174
"net/base/io_buffer.h",
164175
"net/base/io_buffer.cc",
165176
"net/base/completion_callback.h",
166-
"net/base/net_util.h",
167-
"net/base/net_util.cc",
168177
"net/base/host_port_pair.h",
169178
"net/base/host_port_pair.cc",
170179
"net/quic/quic_simple_buffer_allocator.h",
@@ -211,8 +220,6 @@
211220
"crypto/secure_hash_default.cc",
212221
"crypto/curve25519-donna.c",
213222
"crypto/curve25519_openssl.cc",
214-
"crypto/ghash.cc",
215-
"crypto/ghash.h",
216223
"base/memory/scoped_vector.h",
217224
"third_party/modp_b64/modp_b64_data.h",
218225
"base/mac/mach_logging.cc",
@@ -221,11 +228,14 @@
221228
"base/mac/scoped_mach_port.h",
222229
"base/scoped_generic.h",
223230
"base/time/time_mac.cc",
231+
"base/feature_list.h",
224232
"third_party/zlib/*.c",
225233
"third_party/zlib/*.h",
226234
"crypto/third_party/nss/*.c",
227235
"crypto/third_party/nss/*.cc",
228-
"crypto/third_party/nss/*.h"
236+
"crypto/third_party/nss/*.h",
237+
"url/url_canon_*.cc",
238+
"url/url_parse_file.cc"
229239
]
230240
},
231241
{
@@ -245,12 +255,19 @@
245255
}
246256
],
247257
"patches": [
248-
"patch/basepatch.patch",
249-
"patch/freebsd.patch"
258+
"patch/disable_sequence_checker.patch",
259+
"patch/net_errors_remove_file_error.patch",
260+
"patch/quic_session_remove_unused_include.patch",
261+
"patch/pickle_remove_unused_include.patch",
262+
"patch/platform_thread_remove_tracked_objects.patch",
263+
"patch/rand_util_posix.patch",
264+
"patch/persistent_memory_allocator_disable_sharing.patch",
265+
"patch/spdy_header_block_remove_unused_callback.patch",
266+
"patch/url_canon_host_disable_idn_host.patch",
267+
"patch/url_util_remove_unused_function.patch",
268+
"patch/disable_stack_trace.patch"
250269
],
251270
"custom_files": [
252-
{"from": "custom/net_util.h", "to": "net/base/net_util.h"},
253-
{"from": "custom/net_util.cc", "to": "net/base/net_util.cc"},
254271
{"from": "custom/debugger.h", "to": "base/debug/debugger.h"},
255272
{"from": "custom/debugger.cc", "to": "base/debug/debugger.cc"},
256273
{"from": "custom/stubs.cc", "to": "stubs.cc"}

0 commit comments

Comments
 (0)