update chromium and v8 patches
This commit is contained in:
Jeremy Apthorp
parent
aefb8911ec
commit
ef12492d6c
78 changed files with 2816 additions and 7025 deletions
|
|
@ -1,8 +1,14 @@
|
|||
From 0809b4654f69adbc8912ad8922465f46b2d3be18 Mon Sep 17 00:00:00 2001
|
||||
From: Cheng Zhao <zcbenz@gmail.com>
|
||||
Date: Thu, 20 Sep 2018 17:45:32 -0700
|
||||
Subject: can_create_window.patch
|
||||
|
||||
|
||||
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
||||
index 321a12f74202..7a53675a2139 100644
|
||||
index 520dcffb5353..783dc705f748 100644
|
||||
--- a/content/browser/frame_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/frame_host/render_frame_host_impl.cc
|
||||
@@ -3058,6 +3058,38 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
@@ -3142,6 +3142,38 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
|
||||
params->target_url.possibly_invalid_spec());
|
||||
|
||||
|
|
@ -41,23 +47,19 @@ index 321a12f74202..7a53675a2139 100644
|
|||
bool no_javascript_access = false;
|
||||
|
||||
// Filter out URLs to which navigation is disallowed from this context.
|
||||
@@ -3080,8 +3112,9 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
frame_tree_node_->frame_tree()->GetMainFrame()->GetLastCommittedURL(),
|
||||
@@ -3170,6 +3202,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||
last_committed_origin_.GetURL(), params->window_container_type,
|
||||
params->target_url, params->referrer, params->frame_name,
|
||||
- params->disposition, *params->features, params->user_gesture,
|
||||
- params->opener_suppressed, &no_javascript_access);
|
||||
+ params->disposition, *params->features, params->additional_features,
|
||||
+ body, params->user_gesture, params->opener_suppressed,
|
||||
+ &no_javascript_access);
|
||||
params->disposition, *params->features,
|
||||
+ params->additional_features, body,
|
||||
effective_transient_activation_state, params->opener_suppressed,
|
||||
&no_javascript_access);
|
||||
|
||||
if (!can_create_window) {
|
||||
std::move(callback).Run(mojom::CreateNewWindowStatus::kIgnore, nullptr);
|
||||
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
|
||||
index 9c298b182440..2fcbde75ba47 100644
|
||||
index e3b04edb5a30..254f94016b97 100644
|
||||
--- a/content/browser/security_exploit_browsertest.cc
|
||||
+++ b/content/browser/security_exploit_browsertest.cc
|
||||
@@ -293,6 +293,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
||||
@@ -313,6 +313,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
|
||||
|
||||
mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
|
||||
params->target_url = GURL("about:blank");
|
||||
|
|
@ -66,10 +68,10 @@ index 9c298b182440..2fcbde75ba47 100644
|
|||
std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
|
||||
mojom::CreateNewWindowReplyPtr) {}));
|
||||
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
||||
index 09b5766c0794..edb604c80d3f 100644
|
||||
index fb4732e6e666..804086522994 100644
|
||||
--- a/content/common/frame.mojom
|
||||
+++ b/content/common/frame.mojom
|
||||
@@ -11,6 +11,8 @@ import "content/public/common/resource_type.mojom";
|
||||
@@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom";
|
||||
import "content/public/common/resource_load_info.mojom";
|
||||
import "content/public/common/transferrable_url_loader.mojom";
|
||||
import "content/public/common/window_container_type.mojom";
|
||||
|
|
@ -78,7 +80,7 @@ index 09b5766c0794..edb604c80d3f 100644
|
|||
import "mojo/public/mojom/base/string16.mojom";
|
||||
import "mojo/public/mojom/base/unguessable_token.mojom";
|
||||
import "services/network/public/mojom/url_loader.mojom";
|
||||
@@ -148,6 +150,24 @@ interface FrameFactory {
|
||||
@@ -157,6 +159,24 @@ interface FrameFactory {
|
||||
CreateFrame(int32 frame_routing_id, Frame& frame);
|
||||
};
|
||||
|
||||
|
|
@ -102,8 +104,8 @@ index 09b5766c0794..edb604c80d3f 100644
|
|||
+
|
||||
struct CreateNewWindowParams {
|
||||
// True if this open request came in the context of a user gesture.
|
||||
bool user_gesture;
|
||||
@@ -184,6 +204,10 @@ struct CreateNewWindowParams {
|
||||
//
|
||||
@@ -196,6 +216,10 @@ struct CreateNewWindowParams {
|
||||
|
||||
// The window features to use for the new window.
|
||||
blink.mojom.WindowFeatures features;
|
||||
|
|
@ -115,10 +117,10 @@ index 09b5766c0794..edb604c80d3f 100644
|
|||
|
||||
// Operation result when the renderer asks the browser to create a new window.
|
||||
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
||||
index a8927d0ba8da..396ae3d82ba2 100644
|
||||
index 2a896c7072ca..bb54b89bef5c 100644
|
||||
--- a/content/public/browser/content_browser_client.cc
|
||||
+++ b/content/public/browser/content_browser_client.cc
|
||||
@@ -401,6 +401,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
||||
@@ -435,6 +435,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
||||
const std::string& frame_name,
|
||||
WindowOpenDisposition disposition,
|
||||
const blink::mojom::WindowFeatures& features,
|
||||
|
|
@ -128,10 +130,10 @@ index a8927d0ba8da..396ae3d82ba2 100644
|
|||
bool opener_suppressed,
|
||||
bool* no_javascript_access) {
|
||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||
index e9c6b810e050..3ca627448e33 100644
|
||||
index fd5d62fee117..3be31602689c 100644
|
||||
--- a/content/public/browser/content_browser_client.h
|
||||
+++ b/content/public/browser/content_browser_client.h
|
||||
@@ -153,6 +153,7 @@ class RenderFrameHost;
|
||||
@@ -162,6 +162,7 @@ class RenderFrameHost;
|
||||
class RenderProcessHost;
|
||||
class RenderViewHost;
|
||||
class ResourceContext;
|
||||
|
|
@ -139,7 +141,7 @@ index e9c6b810e050..3ca627448e33 100644
|
|||
class ServiceManagerConnection;
|
||||
class SiteInstance;
|
||||
class SpeechRecognitionManagerDelegate;
|
||||
@@ -651,6 +652,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
@@ -706,6 +707,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||
const std::string& frame_name,
|
||||
WindowOpenDisposition disposition,
|
||||
const blink::mojom::WindowFeatures& features,
|
||||
|
|
@ -149,18 +151,18 @@ index e9c6b810e050..3ca627448e33 100644
|
|||
bool opener_suppressed,
|
||||
bool* no_javascript_access);
|
||||
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
||||
index 4aba7a9e290e..a13cc1599d70 100644
|
||||
index 03d9cda9f95d..edad9fc3198c 100644
|
||||
--- a/content/renderer/render_view_impl.cc
|
||||
+++ b/content/renderer/render_view_impl.cc
|
||||
@@ -78,6 +78,7 @@
|
||||
@@ -79,6 +79,7 @@
|
||||
#include "content/renderer/ime_event_guard.h"
|
||||
#include "content/renderer/internal_document_state_data.h"
|
||||
#include "content/renderer/loader/request_extra_data.h"
|
||||
+#include "content/renderer/loader/web_url_request_util.h"
|
||||
#include "content/renderer/media/audio_device_factory.h"
|
||||
#include "content/renderer/media/audio/audio_device_factory.h"
|
||||
#include "content/renderer/media/stream/media_stream_device_observer.h"
|
||||
#include "content/renderer/media/video_capture_impl_manager.h"
|
||||
@@ -1243,6 +1244,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
|
||||
@@ -1270,6 +1271,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
|
||||
}
|
||||
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
|
||||
|
||||
|
|
@ -208,10 +210,10 @@ index 4aba7a9e290e..a13cc1599d70 100644
|
|||
// moved on send.
|
||||
bool is_background_tab =
|
||||
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
|
||||
index 3a908d742130..52294125b799 100644
|
||||
index fe0e3720ea5d..4a31617b5a89 100644
|
||||
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
|
||||
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
|
||||
@@ -247,6 +247,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
|
||||
@@ -276,6 +276,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
|
||||
const std::string& frame_name,
|
||||
WindowOpenDisposition disposition,
|
||||
const blink::mojom::WindowFeatures& features,
|
||||
|
|
@ -221,10 +223,10 @@ index 3a908d742130..52294125b799 100644
|
|||
bool opener_suppressed,
|
||||
bool* no_javascript_access) {
|
||||
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h
|
||||
index d0ba19167522..3d1154b3cb8a 100644
|
||||
index fa458cf0c92d..cdd95a1d88e5 100644
|
||||
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
|
||||
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
|
||||
@@ -67,6 +67,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
|
||||
@@ -66,6 +66,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
|
||||
const std::string& frame_name,
|
||||
WindowOpenDisposition disposition,
|
||||
const blink::mojom::WindowFeatures& features,
|
||||
|
|
@ -233,3 +235,6 @@ index d0ba19167522..3d1154b3cb8a 100644
|
|||
bool user_gesture,
|
||||
bool opener_suppressed,
|
||||
bool* no_javascript_access) override;
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue