Update to Chromium revision 134688.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@612 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
dfd4a8ba99
commit
10a336e500
|
@ -17,5 +17,5 @@
|
|||
|
||||
{
|
||||
'chromium_url': 'http://src.chromium.org/svn/trunk/src',
|
||||
'chromium_revision': '133962',
|
||||
'chromium_revision': '134688',
|
||||
}
|
||||
|
|
|
@ -257,15 +257,16 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
|
|||
url_request_context_->host_resolver(),
|
||||
url_request_context_->cert_verifier(),
|
||||
url_request_context_->server_bound_cert_service(),
|
||||
NULL, // tranport_security_state
|
||||
NULL, /* tranport_security_state */
|
||||
url_request_context_->proxy_service(),
|
||||
"", // ssl_session_cache_shard
|
||||
"", /* ssl_session_cache_shard */
|
||||
url_request_context_->ssl_config_service(),
|
||||
url_request_context_->http_auth_handler_factory(),
|
||||
NULL, // network_delegate
|
||||
NULL, /* network_delegate */
|
||||
url_request_context_->http_server_properties(),
|
||||
NULL,
|
||||
main_backend);
|
||||
main_backend,
|
||||
"" /* trusted_spdy_proxy */);
|
||||
storage_->set_http_transaction_factory(main_cache);
|
||||
|
||||
storage_->set_ftp_transaction_factory(
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
Index: pylib/gyp/input.py
|
||||
Index: gyp/input.py
|
||||
===================================================================
|
||||
--- pylib/gyp/input.py (revision 1107)
|
||||
+++ pylib/gyp/input.py (working copy)
|
||||
@@ -666,7 +666,8 @@
|
||||
--- gyp/input.py (revision 1344)
|
||||
+++ gyp/input.py (working copy)
|
||||
@@ -683,7 +683,8 @@
|
||||
# that don't load quickly, this can be faster than
|
||||
# <!(python modulename param eters). Do this in |build_file_dir|.
|
||||
oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir.
|
||||
|
|
Loading…
Reference in New Issue