Skip to content

Commit

Permalink
Update Chromium version to 53.0.2785.143
Browse files Browse the repository at this point in the history
  • Loading branch information
kaadam committed Jan 12, 2017
1 parent a0317cc commit 2a445a3
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion LKGR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
52.0.2743.116
53.0.2785.143
10 changes: 5 additions & 5 deletions patch/BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/BUILD.gn b/BUILD.gn
index c013d45..1f1fd35 100644
index 23e67d9..025fc95 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -697,6 +697,7 @@ group("gn_only") {
@@ -781,6 +781,7 @@ group("gn_only") {
"//third_party/webrtc/system_wrappers:metrics_default",
"//ui/display/types",
"//ui/shell_dialogs:shell_dialogs_unittests",
"//ui/views/examples:views_examples_exe",
+ "//sprocket:sprocket"
+ "//sprocket:sprocket",
]

if (target_cpu == "x86" || target_cpu == "x64") {
@@ -725,6 +726,7 @@ group("gn_only") {
@@ -818,6 +819,7 @@ group("gn_only") {
deps += [
"//build/android/gyp/test:hello_world",
"//build/android/incremental_install:bootstrap_java",
Expand Down
1 change: 1 addition & 0 deletions src/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ static_library("sprocket_lib") {
"//base",
"//components/devtools_discovery",
"//components/devtools_http_handler",
"//components/network_session_configurator:switches",
"//components/plugins/renderer",
"//content:resources",
"//content/app/resources",
Expand Down
9 changes: 3 additions & 6 deletions src/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ jinja_template("sprocket_manifest") {

android_resources("sprocket_apk_resources") {
resource_dirs = [ "res" ]
deps = [
":sprocket_manifest",
]
custom_package = "hu.uszeged.sprocket"
android_manifest = sprocket_manifest
android_manifest_dep = ":sprocket_manifest"
}

android_library("sprocket_apk_java") {
Expand Down Expand Up @@ -82,14 +80,13 @@ android_assets("sprocket_assets") {
android_apk("sprocket_apk") {
apk_name = "Sprocket"
android_manifest = sprocket_manifest
native_libs = [ "libsprocket_content_view.so" ]
android_manifest_dep = ":sprocket_manifest"
shared_libraries = [ ":libsprocket_content_view" ]
loadable_modules = [ "$root_out_dir/libosmesa.so" ]

deps = [
":sprocket_apk_java",
":sprocket_assets",
":sprocket_manifest",
":libsprocket_content_view",
"//base:base_java",
"//content/public/android:content_java",
"//media/capture/video/android:capture_java",
Expand Down
1 change: 1 addition & 0 deletions src/browser/browser_context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "base/files/file_util.h"
#include "base/path_service.h"
#include "base/nix/xdg_util.h"
#include "components/network_session_configurator/switches.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/permission_manager.h"
#include "content/public/browser/storage_partition.h"
Expand Down
9 changes: 8 additions & 1 deletion src/browser/net/url_request_context_getter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
#include "net/base/cache_type.h"
#include "net/base/network_delegate_impl.h"
#include "net/cert/cert_verifier.h"
#include "net/cert/ct_policy_enforcer.h"
#include "net/cert/multi_log_ct_verifier.h"
#include "net/dns/host_resolver.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"
Expand All @@ -33,7 +35,6 @@
#include "net/url_request/url_request_context_storage.h"
#include "net/url_request/url_request_job_factory_impl.h"


SprocketURLRequestContextGetter::SprocketURLRequestContextGetter(
bool ignore_certificate_errors,
const base::FilePath& base_path,
Expand Down Expand Up @@ -78,6 +79,8 @@ net::URLRequestContext* SprocketURLRequestContextGetter::GetURLRequestContext()
new net::ChannelIDService(new net::DefaultChannelIDStore(NULL),
base::WorkerPool::GetTaskRunner(true))));
storage_->set_cert_verifier(net::CertVerifier::CreateDefault());
storage_->set_cert_transparency_verifier(base::WrapUnique(new net::MultiLogCTVerifier));
storage_->set_ct_policy_enforcer(base::WrapUnique(new net::CTPolicyEnforcer));
storage_->set_transport_security_state(base::WrapUnique(new net::TransportSecurityState));
storage_->set_proxy_service(net::ProxyService::CreateUsingSystemProxyResolver(std::move(proxy_config_service_), 0, NULL));
storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults);
Expand Down Expand Up @@ -118,6 +121,10 @@ net::URLRequestContext* SprocketURLRequestContextGetter::GetURLRequestContext()
url_request_context_->cert_verifier();
network_session_params.transport_security_state =
url_request_context_->transport_security_state();
network_session_params.cert_transparency_verifier =
url_request_context_->cert_transparency_verifier();
network_session_params.ct_policy_enforcer =
url_request_context_->ct_policy_enforcer();
network_session_params.channel_id_service =
url_request_context_->channel_id_service();
network_session_params.proxy_service =
Expand Down
9 changes: 3 additions & 6 deletions src/browser/web_contents.cc
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,9 @@ content::WebContents* SprocketWebContents::OpenURLFromTab(content::WebContents*
params.should_replace_current_entry;
load_url_params.is_renderer_initiated = params.is_renderer_initiated;

// Only allows the browser-initiated navigation to use POST.
if (params.uses_post && !params.is_renderer_initiated) {
load_url_params.load_type =
content::NavigationController::LOAD_TYPE_BROWSER_INITIATED_HTTP_POST;
load_url_params.browser_initiated_post_data =
params.browser_initiated_post_data;
if (params.uses_post) {
load_url_params.load_type = content::NavigationController::LOAD_TYPE_HTTP_POST;
load_url_params.post_data = params.post_data;
}

source->GetController().LoadURLWithParams(load_url_params);
Expand Down
2 changes: 1 addition & 1 deletion src/common/content_client.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ base::StringPiece SprocketContentClient::GetDataResource(
resource_id, scale_factor);
}

base::RefCountedStaticMemory* SprocketContentClient::GetDataResourceBytes(
base::RefCountedMemory* SprocketContentClient::GetDataResourceBytes(
int resource_id) const {
return ResourceBundle::GetSharedInstance().LoadDataResourceBytes(resource_id);
}
Expand Down
2 changes: 1 addition & 1 deletion src/common/content_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SprocketContentClient : public content::ContentClient {
ui::ScaleFactor scale_factor) const override;

// Returns the raw bytes of a scale independent data resource.
base::RefCountedStaticMemory* GetDataResourceBytes(
base::RefCountedMemory* GetDataResourceBytes(
int resource_id) const override;

// Returns a native image given its id.
Expand Down

0 comments on commit 2a445a3

Please sign in to comment.