bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 134688.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@612 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-05-01 17:47:54 +00:00
parent dfd4a8ba99
commit 10a336e500
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -17,5 +17,5 @@
{ {
'chromium_url': 'http://src.chromium.org/svn/trunk/src', 'chromium_url': 'http://src.chromium.org/svn/trunk/src',
'chromium_revision': '133962', 'chromium_revision': '134688',
} }

9
libcef/browser/url_request_context_getter.cc
View File

@ -257,15 +257,16 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
url_request_context_->host_resolver(), url_request_context_->host_resolver(),
url_request_context_->cert_verifier(), url_request_context_->cert_verifier(),
url_request_context_->server_bound_cert_service(), url_request_context_->server_bound_cert_service(),
NULL, // tranport_security_state NULL, /* tranport_security_state */
url_request_context_->proxy_service(), url_request_context_->proxy_service(),
"", // ssl_session_cache_shard "", /* ssl_session_cache_shard */
url_request_context_->ssl_config_service(), url_request_context_->ssl_config_service(),
url_request_context_->http_auth_handler_factory(), url_request_context_->http_auth_handler_factory(),
NULL, // network_delegate NULL, /* network_delegate */
url_request_context_->http_server_properties(), url_request_context_->http_server_properties(),
NULL, NULL,
main_backend); main_backend,
"" /* trusted_spdy_proxy */);
storage_->set_http_transaction_factory(main_cache); storage_->set_http_transaction_factory(main_cache);
storage_->set_ftp_transaction_factory( storage_->set_ftp_transaction_factory(

8
patch/patches/tools_gyp.patch
View File

@ -1,8 +1,8 @@
Index: pylib/gyp/input.py Index: gyp/input.py
=================================================================== ===================================================================
--- pylib/gyp/input.py (revision 1107) --- gyp/input.py (revision 1344)
+++ pylib/gyp/input.py (working copy) +++ gyp/input.py (working copy)
@@ -666,7 +666,8 @@ @@ -683,7 +683,8 @@
# that don't load quickly, this can be faster than # that don't load quickly, this can be faster than
# <!(python modulename param eters). Do this in |build_file_dir|. # <!(python modulename param eters). Do this in |build_file_dir|.
oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir. oldwd = os.getcwd() # Python doesn't like os.open('.'): no fchdir.