зеркало из https://github.com/electron/electron.git
chore: bump chromium to 130.0.6671.0 (main) (#43429)
* chore: bump chromium in DEPS to 130.0.6671.0 * 5802591: [Partitioned Popins] (6) Add permissions policy for popin https://chromium-review.googlesource.com/c/chromium/src/+/5802591 * 5794132: [video pip] Move back to tab button to the header https://chromium-review.googlesource.com/c/chromium/src/+/5794132 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Родитель
50ce448556
Коммит
baf0182a42
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'130.0.6669.0',
|
'130.0.6671.0',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v20.16.0',
|
'v20.16.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -114,6 +114,8 @@ static_library("chrome") {
|
||||||
"//chrome/browser/ui/view_ids.h",
|
"//chrome/browser/ui/view_ids.h",
|
||||||
"//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
|
"//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
|
||||||
"//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
|
"//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
|
||||||
|
"//chrome/browser/ui/views/overlay/back_to_tab_button.cc",
|
||||||
|
"//chrome/browser/ui/views/overlay/back_to_tab_button.h",
|
||||||
"//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
|
"//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
|
||||||
"//chrome/browser/ui/views/overlay/close_image_button.cc",
|
"//chrome/browser/ui/views/overlay/close_image_button.cc",
|
||||||
"//chrome/browser/ui/views/overlay/close_image_button.h",
|
"//chrome/browser/ui/views/overlay/close_image_button.h",
|
||||||
|
|
|
@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
|
||||||
This should be upstreamed.
|
This should be upstreamed.
|
||||||
|
|
||||||
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
|
||||||
index abe3efcde9def9144804ec2a7f3b5ebfa308bcb7..70da55386d842a9f4ff6e84b13b9f1d99244516e 100644
|
index d2be94d0d77ef798c888177cd4b882521335059b..8ed6f393da68f6d4ccb951f4d2c951e66e791b8f 100644
|
||||||
--- a/content/gpu/gpu_main.cc
|
--- a/content/gpu/gpu_main.cc
|
||||||
+++ b/content/gpu/gpu_main.cc
|
+++ b/content/gpu/gpu_main.cc
|
||||||
@@ -258,6 +258,10 @@ int GpuMain(MainFunctionParams parameters) {
|
@@ -258,6 +258,10 @@ int GpuMain(MainFunctionParams parameters) {
|
||||||
|
@ -24,7 +24,7 @@ index abe3efcde9def9144804ec2a7f3b5ebfa308bcb7..70da55386d842a9f4ff6e84b13b9f1d9
|
||||||
// We are experiencing what appear to be memory-stomp issues in the GPU
|
// We are experiencing what appear to be memory-stomp issues in the GPU
|
||||||
// process. These issues seem to be impacting the task executor and listeners
|
// process. These issues seem to be impacting the task executor and listeners
|
||||||
// registered to it. Create the task executor on the heap to guard against
|
// registered to it. Create the task executor on the heap to guard against
|
||||||
@@ -357,7 +361,6 @@ int GpuMain(MainFunctionParams parameters) {
|
@@ -358,7 +362,6 @@ int GpuMain(MainFunctionParams parameters) {
|
||||||
#endif
|
#endif
|
||||||
const bool dead_on_arrival = !init_success;
|
const bool dead_on_arrival = !init_success;
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ index ad0092ef2e13853e4bb8b923481559a043b00ab7..1c2dfd23f18733e21312992877ae1499
|
||||||
int32_t world_id) {}
|
int32_t world_id) {}
|
||||||
virtual void DidClearWindowObject() {}
|
virtual void DidClearWindowObject() {}
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index 498cec822e5f1b36f4864bcf8bb8f31f11e96456..f1fef17fba419e26dfe82c4449621447b0f2f2a0 100644
|
index 6d7b1acf986b8cd83c10c43135a975e6a2c9db7f..55ef555fd10a08a5b903e2e86b363934c9d026b9 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -4722,6 +4722,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
@@ -4722,6 +4722,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
||||||
|
|
|
@ -23,10 +23,10 @@ index 68ef2666b57f95f0a4f463c34ca4b074b9e38d87..d399155b4221f4ea49cc57b14d2cd084
|
||||||
return receiver_.BindNewEndpointAndPassDedicatedRemote();
|
return receiver_.BindNewEndpointAndPassDedicatedRemote();
|
||||||
}
|
}
|
||||||
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
index 2dcb41397b68ee22e71a4e21adcc843abc1422aa..5d94da88fe9c8ca0f94644b9940886967ae64b40 100644
|
index 6876e6cc484741d23b0b13f6b44a1327b63a470d..8cc8441e1343ac420ad0f35374b9060e9a3f35b7 100644
|
||||||
--- a/content/browser/renderer_host/render_view_host_impl.cc
|
--- a/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_view_host_impl.cc
|
+++ b/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
@@ -738,6 +738,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
|
@@ -753,6 +753,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
|
||||||
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
|
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,10 +104,10 @@ index c980f3f76a37a4207bb54f18fbcdb8d0950c8856..91a9dfe56fbbcd1cc873add438947dd2
|
||||||
+ SetSchedulerThrottling(bool allowed);
|
+ SetSchedulerThrottling(bool allowed);
|
||||||
};
|
};
|
||||||
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
|
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
|
||||||
index 4220a0aebf4a2ce3d62f76c441b6ec1b5e11ffa1..6ea17602d2b186b81cf7dc69750bd302ff717aea 100644
|
index 746af7113a66d26de389237ebd90ec9e6a569cc3..f2f14184eafc919a303da6679a516bdd3a825a51 100644
|
||||||
--- a/third_party/blink/public/web/web_view.h
|
--- a/third_party/blink/public/web/web_view.h
|
||||||
+++ b/third_party/blink/public/web/web_view.h
|
+++ b/third_party/blink/public/web/web_view.h
|
||||||
@@ -362,6 +362,7 @@ class BLINK_EXPORT WebView {
|
@@ -368,6 +368,7 @@ class BLINK_EXPORT WebView {
|
||||||
// Scheduling -----------------------------------------------------------
|
// Scheduling -----------------------------------------------------------
|
||||||
|
|
||||||
virtual PageScheduler* Scheduler() const = 0;
|
virtual PageScheduler* Scheduler() const = 0;
|
||||||
|
@ -116,10 +116,10 @@ index 4220a0aebf4a2ce3d62f76c441b6ec1b5e11ffa1..6ea17602d2b186b81cf7dc69750bd302
|
||||||
// Visibility -----------------------------------------------------------
|
// Visibility -----------------------------------------------------------
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index 42b00bd0b3c228824a6765496a9badde3cb8871b..c27999d3380185c082b828f1c3644dda35361eac 100644
|
index 8f3603538170a4e66a3f832b1882ed587383cfcc..3f3945f8aa35513050060df8d65059b89f9b3933 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -2443,6 +2443,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
@@ -2449,6 +2449,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
||||||
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
|
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
|
||||||
"old_state", old_state, "new_state", new_state);
|
"old_state", old_state, "new_state", new_state);
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ index 42b00bd0b3c228824a6765496a9badde3cb8871b..c27999d3380185c082b828f1c3644dda
|
||||||
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
|
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
|
||||||
!old_state->is_in_back_forward_cache;
|
!old_state->is_in_back_forward_cache;
|
||||||
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
|
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
|
||||||
@@ -3965,10 +3969,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
@@ -3971,10 +3975,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
||||||
return GetPage()->GetPageScheduler();
|
return GetPage()->GetPageScheduler();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,10 +155,10 @@ index 42b00bd0b3c228824a6765496a9badde3cb8871b..c27999d3380185c082b828f1c3644dda
|
||||||
// Do not throttle if the page should be painting.
|
// Do not throttle if the page should be painting.
|
||||||
bool is_visible =
|
bool is_visible =
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
index d4f129c072ef1c9d26b7c7123fc517b0f20bfa05..309440db5306b588fd8db9607ee8ca39ea6ebe7e 100644
|
index 69318d9676ed633de315c8b2167679439a3874c1..8b9593d8bcaeed498257bd11eb1027fc78ba14bd 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
@@ -446,6 +446,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
@@ -448,6 +448,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||||
LocalDOMWindow* PagePopupWindow() const;
|
LocalDOMWindow* PagePopupWindow() const;
|
||||||
|
|
||||||
PageScheduler* Scheduler() const override;
|
PageScheduler* Scheduler() const override;
|
||||||
|
@ -166,7 +166,7 @@ index d4f129c072ef1c9d26b7c7123fc517b0f20bfa05..309440db5306b588fd8db9607ee8ca39
|
||||||
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
|
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
|
||||||
bool is_initial_state) override;
|
bool is_initial_state) override;
|
||||||
mojom::blink::PageVisibilityState GetVisibilityState() override;
|
mojom::blink::PageVisibilityState GetVisibilityState() override;
|
||||||
@@ -926,6 +927,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
@@ -929,6 +930,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||||
// If true, we send IPC messages when |preferred_size_| changes.
|
// If true, we send IPC messages when |preferred_size_| changes.
|
||||||
bool send_preferred_size_changes_ = false;
|
bool send_preferred_size_changes_ = false;
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
|
||||||
patch.
|
patch.
|
||||||
|
|
||||||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||||||
index a79561241a182e5e168201598aef29dd2fff3d02..7877c4a4609a2915d2661b85e2f99f6a741f2d6d 100644
|
index 78923a81c64fb7738f4e457e3166a88f3c150564..ee348433544550f99622b52252fd1064c46da35a 100644
|
||||||
--- a/chrome/BUILD.gn
|
--- a/chrome/BUILD.gn
|
||||||
+++ b/chrome/BUILD.gn
|
+++ b/chrome/BUILD.gn
|
||||||
@@ -196,11 +196,16 @@ if (!is_android && !is_mac) {
|
@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
|
||||||
"common/crash_keys.h",
|
"common/crash_keys.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -33,10 +33,10 @@ index a79561241a182e5e168201598aef29dd2fff3d02..7877c4a4609a2915d2661b85e2f99f6a
|
||||||
"//base",
|
"//base",
|
||||||
"//build:branding_buildflags",
|
"//build:branding_buildflags",
|
||||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||||
index 73ab1b4a9983792eee54afac0e7cd8bde3ab99dd..b7feacd35284654472e1b463eee62da49b6a659c 100644
|
index 7a23e63b800f87b6189ca04ce33c2c9b971e1152..50c51fad27925adf4a1e5fc9e03f7bca2153daa5 100644
|
||||||
--- a/chrome/browser/BUILD.gn
|
--- a/chrome/browser/BUILD.gn
|
||||||
+++ b/chrome/browser/BUILD.gn
|
+++ b/chrome/browser/BUILD.gn
|
||||||
@@ -4477,7 +4477,7 @@ static_library("browser") {
|
@@ -4482,7 +4482,7 @@ static_library("browser") {
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,10 +46,10 @@ index 73ab1b4a9983792eee54afac0e7cd8bde3ab99dd..b7feacd35284654472e1b463eee62da4
|
||||||
# than here in :chrome_dll.
|
# than here in :chrome_dll.
|
||||||
deps += [ "//chrome:packed_resources_integrity_header" ]
|
deps += [ "//chrome:packed_resources_integrity_header" ]
|
||||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||||
index b20b741da89d637dfea49baea0955380bf69d8f2..6c3e38cd3d0f0c5e5b20c5c26ddd960116cee132 100644
|
index 633854df22c94cb2b7e02c1eda2663ca8091e11e..79ed45cf2b14ac3f504317305f4ae10e5413ff63 100644
|
||||||
--- a/chrome/test/BUILD.gn
|
--- a/chrome/test/BUILD.gn
|
||||||
+++ b/chrome/test/BUILD.gn
|
+++ b/chrome/test/BUILD.gn
|
||||||
@@ -7041,9 +7041,12 @@ test("unit_tests") {
|
@@ -7050,9 +7050,12 @@ test("unit_tests") {
|
||||||
"//chrome/notification_helper",
|
"//chrome/notification_helper",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ index b20b741da89d637dfea49baea0955380bf69d8f2..6c3e38cd3d0f0c5e5b20c5c26ddd9601
|
||||||
"//chrome//services/util_win:unit_tests",
|
"//chrome//services/util_win:unit_tests",
|
||||||
"//chrome/app:chrome_dll_resources",
|
"//chrome/app:chrome_dll_resources",
|
||||||
"//chrome/app:win_unit_tests",
|
"//chrome/app:win_unit_tests",
|
||||||
@@ -8070,6 +8073,10 @@ test("unit_tests") {
|
@@ -8079,6 +8082,10 @@ test("unit_tests") {
|
||||||
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
|
"../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ index b20b741da89d637dfea49baea0955380bf69d8f2..6c3e38cd3d0f0c5e5b20c5c26ddd9601
|
||||||
sources += [
|
sources += [
|
||||||
# The importer code is not used on Android.
|
# The importer code is not used on Android.
|
||||||
"../common/importer/firefox_importer_utils_unittest.cc",
|
"../common/importer/firefox_importer_utils_unittest.cc",
|
||||||
@@ -8137,7 +8144,6 @@ test("unit_tests") {
|
@@ -8146,7 +8153,6 @@ test("unit_tests") {
|
||||||
# Non-android deps for "unit_tests" target.
|
# Non-android deps for "unit_tests" target.
|
||||||
deps += [
|
deps += [
|
||||||
"../browser/screen_ai:screen_ai_install_state",
|
"../browser/screen_ai:screen_ai_install_state",
|
||||||
|
|
|
@ -9,10 +9,10 @@ potentially prevent a window from being created.
|
||||||
TODO(loc): this patch is currently broken.
|
TODO(loc): this patch is currently broken.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index d89c5c16aa5c47c30e3922a618ef88106ecc7d4b..bc39bd106a9d227a378c31248a263315b8179fc4 100644
|
index 14f11b689cc55f3dd2a53598bba504e5fb317f6c..7a436aa00f9a54ff04dc05f0a49776b6acc81c1e 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -8870,6 +8870,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -8876,6 +8876,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
last_committed_origin_, params->window_container_type,
|
last_committed_origin_, params->window_container_type,
|
||||||
params->target_url, params->referrer.To<Referrer>(),
|
params->target_url, params->referrer.To<Referrer>(),
|
||||||
params->frame_name, params->disposition, *params->features,
|
params->frame_name, params->disposition, *params->features,
|
||||||
|
@ -21,10 +21,10 @@ index d89c5c16aa5c47c30e3922a618ef88106ecc7d4b..bc39bd106a9d227a378c31248a263315
|
||||||
&no_javascript_access);
|
&no_javascript_access);
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index a698af18e65a2ba6577ad24b12502974e99e85bc..5927ad75e9d7d5f0e69a7c5165c3637a966db930 100644
|
index 69f8d47043457b8a5947585d474bebfc963cc2c0..30f60283002c6b0fb540a47def95e8496dccebdb 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4758,6 +4758,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4760,6 +4760,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
new_contents_impl->partitioned_popin_opener_ = opener->GetWeakPtr();
|
new_contents_impl->partitioned_popin_opener_ = opener->GetWeakPtr();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ index a698af18e65a2ba6577ad24b12502974e99e85bc..5927ad75e9d7d5f0e69a7c5165c3637a
|
||||||
// If the new frame has a name, make sure any SiteInstances that can find
|
// If the new frame has a name, make sure any SiteInstances that can find
|
||||||
// this named frame have proxies for it. Must be called after
|
// this named frame have proxies for it. Must be called after
|
||||||
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
||||||
@@ -4799,12 +4805,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4801,12 +4807,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
AddWebContentsDestructionObserver(new_contents_impl);
|
AddWebContentsDestructionObserver(new_contents_impl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,10 +51,10 @@ index a698af18e65a2ba6577ad24b12502974e99e85bc..5927ad75e9d7d5f0e69a7c5165c3637a
|
||||||
new_contents_impl, opener, params.target_url,
|
new_contents_impl, opener, params.target_url,
|
||||||
params.referrer.To<Referrer>(), params.disposition,
|
params.referrer.To<Referrer>(), params.disposition,
|
||||||
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
||||||
index 37a00f8d520e6043faa9b202e2f7a3d7a0794664..08b56afaa591137aafc4aad38da84361742bbe66 100644
|
index aa982181c584f25e11383bcdac7d11fd6d72105f..79e9eac46a5ccc54a9a6a167b81e31f6b4ae0ddf 100644
|
||||||
--- a/content/common/frame.mojom
|
--- a/content/common/frame.mojom
|
||||||
+++ b/content/common/frame.mojom
|
+++ b/content/common/frame.mojom
|
||||||
@@ -605,6 +605,10 @@ struct CreateNewWindowParams {
|
@@ -610,6 +610,10 @@ struct CreateNewWindowParams {
|
||||||
// The navigation initiator's user activation and ad status.
|
// The navigation initiator's user activation and ad status.
|
||||||
blink.mojom.NavigationInitiatorActivationAndAdStatus
|
blink.mojom.NavigationInitiatorActivationAndAdStatus
|
||||||
initiator_activation_and_ad_status;
|
initiator_activation_and_ad_status;
|
||||||
|
@ -79,7 +79,7 @@ index 79c37e0aeb8aa1cca6db91ab5ac572cde61e65c5..58253590cfacda1684ab968c9dda7a4f
|
||||||
bool opener_suppressed,
|
bool opener_suppressed,
|
||||||
bool* no_javascript_access) {
|
bool* no_javascript_access) {
|
||||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||||
index ddca696e47412f0a054fd8c305bcca19a225e3e9..e3b8c5ba47193b57124ce743179a1b2009eb3ce7 100644
|
index 19891b56fca5d0633b0ad3fb162918c3a2df1962..1aabf4da23e5492c33b3d29bf5cc641aba510bda 100644
|
||||||
--- a/content/public/browser/content_browser_client.h
|
--- a/content/public/browser/content_browser_client.h
|
||||||
+++ b/content/public/browser/content_browser_client.h
|
+++ b/content/public/browser/content_browser_client.h
|
||||||
@@ -190,6 +190,7 @@ class NetworkService;
|
@@ -190,6 +190,7 @@ class NetworkService;
|
||||||
|
@ -148,7 +148,7 @@ index 553a8726a501171a44cbca4d7d8a9e026347f1c8..c4ba5fb97c43609fe570ce3401bb9f07
|
||||||
// typically happens when popups are created.
|
// typically happens when popups are created.
|
||||||
virtual void WebContentsCreated(WebContents* source_contents,
|
virtual void WebContentsCreated(WebContents* source_contents,
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index 3a708d41f0a10d6179dadcdbcd4c9f46bfc8149e..498cec822e5f1b36f4864bcf8bb8f31f11e96456 100644
|
index b3abe03a22357fa98e604e87fd9cdd8b6e804eff..6d7b1acf986b8cd83c10c43135a975e6a2c9db7f 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -6704,6 +6704,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
@@ -6704,6 +6704,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
||||||
|
@ -210,15 +210,15 @@ index c576ace24e81cc877aa2595d40e0a13a7af9f6a2..210fb97d44c19c29af424cc7b9cb3169
|
||||||
|
|
||||||
} // namespace blink
|
} // namespace blink
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
index d84f42c122edee47a6804e55b988a82fa2e7abf7..84ae49e85f873ee1d68197268c43090c8691c819 100644
|
index 96d7ba915e3d4248ad801237b0b43ff0b55be1a2..24cf1a2aa6f821c4d5597d98f3bf98a10bd30555 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
|
||||||
@@ -2246,6 +2246,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
@@ -2245,6 +2245,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
|
||||||
|
|
||||||
WebWindowFeatures window_features =
|
WebWindowFeatures window_features =
|
||||||
GetWindowFeaturesFromString(features, entered_window);
|
GetWindowFeaturesFromString(features, entered_window);
|
||||||
|
|
||||||
+ window_features.raw_features = features;
|
|
||||||
+
|
+
|
||||||
// In fenced frames, we should always use `noopener`.
|
+ window_features.raw_features = features;
|
||||||
if (GetFrame()->IsInFencedFrameTree()) {
|
|
||||||
window_features.noopener = true;
|
if (window_features.is_partitioned_popin &&
|
||||||
|
!IsFeatureEnabled(
|
||||||
|
|
|
@ -218,10 +218,10 @@ index c5b0d3b23b8da318ae55fcac2515a1187f261469..16ed1f46c9afde0ff25750128b4fcff6
|
||||||
void AddNewContents(content::WebContents* source,
|
void AddNewContents(content::WebContents* source,
|
||||||
std::unique_ptr<content::WebContents> new_contents,
|
std::unique_ptr<content::WebContents> new_contents,
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index f683fdc187934fde7c67c6722b36c85ce993119d..fd884becfbb7b36e99e9df3dfe00602bf3ddb8a6 100644
|
index 5bcf895fbcc395ab664e208772e0fe5a9f99e153..e3246011d776a8242530b117a55d0c909277a6d5 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4654,8 +4654,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4656,8 +4656,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
|
|
||||||
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
||||||
source_site_instance, params.window_container_type,
|
source_site_instance, params.window_container_type,
|
||||||
|
|
|
@ -9,10 +9,10 @@ rate-limiting, compression and global annotations.
|
||||||
This should be upstreamed.
|
This should be upstreamed.
|
||||||
|
|
||||||
diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
|
diff --git a/components/crash/core/app/crash_reporter_client.cc b/components/crash/core/app/crash_reporter_client.cc
|
||||||
index 3f3ed53d48fc4b19642cae847e69982782790e31..51d089f9fa0e1734f98f270a81a200beda71f2f4 100644
|
index 0e9fe8892af82d77f8530ead358e820d9b6b3912..43465dd285a99c40f3bc4dca19945fb08060160b 100644
|
||||||
--- a/components/crash/core/app/crash_reporter_client.cc
|
--- a/components/crash/core/app/crash_reporter_client.cc
|
||||||
+++ b/components/crash/core/app/crash_reporter_client.cc
|
+++ b/components/crash/core/app/crash_reporter_client.cc
|
||||||
@@ -141,6 +141,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
@@ -145,6 +145,17 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
|
||||||
should continue seeking for a real fix.
|
should continue seeking for a real fix.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
|
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
|
||||||
index de2139d2e7f938d08aa824fdd90e1633dc34ac69..38c228c1df9ae5cbd27844b01929a964bba53f55 100644
|
index 5e216bba01de04bd3b2fb9ee5df6edd8904424f2..98edabd37a1faa35c2ba0413f6a5c3b4f871ff5e 100644
|
||||||
--- a/content/browser/renderer_host/navigator.cc
|
--- a/content/browser/renderer_host/navigator.cc
|
||||||
+++ b/content/browser/renderer_host/navigator.cc
|
+++ b/content/browser/renderer_host/navigator.cc
|
||||||
@@ -1338,6 +1338,7 @@ void Navigator::RecordNavigationMetrics(
|
@@ -1347,6 +1347,7 @@ void Navigator::RecordNavigationMetrics(
|
||||||
.InMilliseconds());
|
.InMilliseconds());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ index de2139d2e7f938d08aa824fdd90e1633dc34ac69..38c228c1df9ae5cbd27844b01929a964
|
||||||
// If this is a same-process navigation and we have timestamps for unload
|
// If this is a same-process navigation and we have timestamps for unload
|
||||||
// durations, fill those metrics out as well.
|
// durations, fill those metrics out as well.
|
||||||
if (params.unload_start && params.unload_end &&
|
if (params.unload_start && params.unload_end &&
|
||||||
@@ -1387,6 +1388,7 @@ void Navigator::RecordNavigationMetrics(
|
@@ -1396,6 +1397,7 @@ void Navigator::RecordNavigationMetrics(
|
||||||
first_before_unload_start_time)
|
first_before_unload_start_time)
|
||||||
.InMilliseconds());
|
.InMilliseconds());
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,10 +12,10 @@ Ideally we could add an embedder observer pattern here but that can be
|
||||||
done in future work.
|
done in future work.
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index c27999d3380185c082b828f1c3644dda35361eac..dbdb105dfac4b490033b795cedb95be43fbddcc9 100644
|
index 3f3945f8aa35513050060df8d65059b89f9b3933..282ae9ec41d68e8f0fad2bb735475241d3515ea4 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -168,6 +168,7 @@
|
@@ -169,6 +169,7 @@
|
||||||
#include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
|
#include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
|
||||||
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
|
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
|
||||||
#include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
|
#include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
|
||||||
|
@ -23,7 +23,7 @@ index c27999d3380185c082b828f1c3644dda35361eac..dbdb105dfac4b490033b795cedb95be4
|
||||||
#include "third_party/blink/renderer/platform/graphics/image.h"
|
#include "third_party/blink/renderer/platform/graphics/image.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
||||||
@@ -1841,6 +1842,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
@@ -1847,6 +1848,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
web_view_impl->SetMaximumLegibleScale(
|
web_view_impl->SetMaximumLegibleScale(
|
||||||
prefs.default_maximum_page_scale_factor);
|
prefs.default_maximum_page_scale_factor);
|
||||||
|
|
|
@ -521,7 +521,7 @@ index 796ae2688436eb07f19909641d1620dd02f10cdb..c9e0eee0b329caf46669b419b1cd10cf
|
||||||
waiting_on_draw_ack_ = true;
|
waiting_on_draw_ack_ = true;
|
||||||
|
|
||||||
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
||||||
index f0c4c7eb70207c58cc7db85c20c0417bf1deeecd..3a9facb4671147d10648c04aac9155d7c60f89ce 100644
|
index 03790c67247044236ac0948b10763d7eeba26389..2544644da43ecc2cac5c39e11d4764b9b881d249 100644
|
||||||
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
||||||
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
|
||||||
@@ -102,7 +102,8 @@ RootCompositorFrameSinkImpl::Create(
|
@@ -102,7 +102,8 @@ RootCompositorFrameSinkImpl::Create(
|
||||||
|
|
|
@ -75,10 +75,10 @@ index 5d692d88c9f95845c97f848fd421916c52bd2416..b0131582dc0a308e1525b12b554dd03e
|
||||||
|
|
||||||
PictureInPictureOcclusionTracker*
|
PictureInPictureOcclusionTracker*
|
||||||
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
index 9b74fd8accacb16860cf6961016c1f5205e98ba0..4557f8b4fa9bc16058f5a831e572f0cb0f0e1a31 100644
|
index 98363d75fe7103df8794d85c672fae1cb71c8179..5e556fb6ea2141c415f6f8aa63eaaa5309f15adc 100644
|
||||||
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
@@ -349,11 +349,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
@@ -350,11 +350,13 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
||||||
|
|
||||||
#endif // BUILDFLAG(IS_WIN)
|
#endif // BUILDFLAG(IS_WIN)
|
||||||
|
|
||||||
|
|
|
@ -87,10 +87,10 @@ index 0c7d5b2c1d3e97420913bd643bb2a524a76fc286..653793fa480f035ce11e079b370bf5ed
|
||||||
// The view with active text input state, i.e., a focused <input> element.
|
// The view with active text input state, i.e., a focused <input> element.
|
||||||
// It will be nullptr if no such view exists. Note that the active view
|
// It will be nullptr if no such view exists. Note that the active view
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 5ef6e65f6e399f1bc718100015db4baf206ffa4a..06bc8da1ec0d3dad19486c028fcaffdebfd17116 100644
|
index 9ff1f515733c6459666170d47899f44e8605f775..dfbcbe8d64a52ffc3a6e2b7c282ec3b3a446c0f4 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -9217,7 +9217,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
@@ -9223,7 +9223,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
||||||
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
||||||
"render_frame_host", frame);
|
"render_frame_host", frame);
|
||||||
RenderWidgetHostViewBase* root_view =
|
RenderWidgetHostViewBase* root_view =
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: frame_host_manager.patch
|
||||||
Allows embedder to intercept site instances created by chromium.
|
Allows embedder to intercept site instances created by chromium.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
index d8e55dd35c7bcfc341585b901ed8dc261d03870a..eaa3b5fe6320a746298c45c799ef4b29877d3542 100644
|
index c8c9bf3aa329b314027b5b3826fe496b47c30188..dc5357a845f1a5c5fc71188b07aa17902b049e36 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
--- a/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
|
||||||
@@ -4471,6 +4471,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
@@ -4478,6 +4478,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
||||||
request->ResetStateForSiteInstanceChange();
|
request->ResetStateForSiteInstanceChange();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ index d8e55dd35c7bcfc341585b901ed8dc261d03870a..eaa3b5fe6320a746298c45c799ef4b29
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
|
||||||
index e3b8c5ba47193b57124ce743179a1b2009eb3ce7..7270f41928836daed875b99253798e50080f83a8 100644
|
index 1aabf4da23e5492c33b3d29bf5cc641aba510bda..f821a47caf042b4093bd6cf7b951fd8c28c73d4a 100644
|
||||||
--- a/content/public/browser/content_browser_client.h
|
--- a/content/public/browser/content_browser_client.h
|
||||||
+++ b/content/public/browser/content_browser_client.h
|
+++ b/content/public/browser/content_browser_client.h
|
||||||
@@ -331,6 +331,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
@@ -331,6 +331,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||||
|
|
|
@ -468,7 +468,7 @@ index 00493dc6c3f0229438b440a6fb2438ca668aba6b..6ce251058868529551cd6f008f840e06
|
||||||
return kAttributes;
|
return kAttributes;
|
||||||
}
|
}
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index 81447acd8daf72136b9bb5688c5d89f3277fe97d..6cc8915935323c1fee2638753ac3c353cbe1be69 100644
|
index 29dc84944dbf42dfdfdc43b8a49913cff374d919..3c3dfc789890eda3007c0723e6730e5fb88c4646 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -72,6 +72,7 @@ source_set("browser") {
|
@@ -72,6 +72,7 @@ source_set("browser") {
|
||||||
|
@ -629,10 +629,10 @@ index 9f48c905f4abbb0f2e184299a915232cf6a0f6b0..f2d36e7b59533d7514a61a931341ef61
|
||||||
public_deps = [
|
public_deps = [
|
||||||
":mojo_bindings",
|
":mojo_bindings",
|
||||||
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
|
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
|
||||||
index 6b6d292cf28c25c5ee903b2833eaf797bcbd8706..cedeb95341224e404372f7e54b8c8b026c6fb926 100644
|
index 2ac766d0149f0405b3fcad0ec1b6e0685ed3658c..5554eb0e084becf8100579f1d15e4796345676ba 100644
|
||||||
--- a/content/renderer/BUILD.gn
|
--- a/content/renderer/BUILD.gn
|
||||||
+++ b/content/renderer/BUILD.gn
|
+++ b/content/renderer/BUILD.gn
|
||||||
@@ -232,6 +232,7 @@ target(link_target_type, "renderer") {
|
@@ -230,6 +230,7 @@ target(link_target_type, "renderer") {
|
||||||
}
|
}
|
||||||
|
|
||||||
configs += [ "//content:content_implementation" ]
|
configs += [ "//content:content_implementation" ]
|
||||||
|
|
|
@ -10,7 +10,7 @@ an about:blank check to this area.
|
||||||
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 33d3f54069b0ad2d6b752cf75101d82dda778ecc..9f4c12acfbbd3408fc3f64cfa065297e731989db 100644
|
index 8635932b649e575ccf98beb1b43afa3ba9d6e194..e8b05c28cd4da089c8cab916f530e81c8c67fac6 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -785,8 +785,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
@@ -785,8 +785,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
||||||
|
|
|
@ -39,7 +39,7 @@ index d236578cefc347e772305ac7ec54b9734e4aa20b..6bb89cea3b6b91ec8ea351ed60c4e405
|
||||||
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
|
ui::ImageModel::FromVectorIcon(*icon, kColorPipWindowForeground,
|
||||||
kCloseButtonIconSize));
|
kCloseButtonIconSize));
|
||||||
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
index cab32e89d40c86fa99e9e2375b968d99c7859003..9b74fd8accacb16860cf6961016c1f5205e98ba0 100644
|
index 0f0f44450b36c1ae38b60c34bff139c0104fe042..98363d75fe7103df8794d85c672fae1cb71c8179 100644
|
||||||
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
--- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
+++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
|
||||||
@@ -17,9 +17,11 @@
|
@@ -17,9 +17,11 @@
|
||||||
|
@ -52,9 +52,9 @@ index cab32e89d40c86fa99e9e2375b968d99c7859003..9b74fd8accacb16860cf6961016c1f52
|
||||||
#include "chrome/browser/ui/browser_finder.h"
|
#include "chrome/browser/ui/browser_finder.h"
|
||||||
+#endif
|
+#endif
|
||||||
#include "chrome/browser/ui/color/chrome_color_id.h"
|
#include "chrome/browser/ui/color/chrome_color_id.h"
|
||||||
|
#include "chrome/browser/ui/views/overlay/back_to_tab_button.h"
|
||||||
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
|
#include "chrome/browser/ui/views/overlay/back_to_tab_label_button.h"
|
||||||
#include "chrome/browser/ui/views/overlay/close_image_button.h"
|
@@ -62,7 +64,7 @@
|
||||||
@@ -61,7 +63,7 @@
|
|
||||||
#include "ui/aura/window.h"
|
#include "ui/aura/window.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ index cab32e89d40c86fa99e9e2375b968d99c7859003..9b74fd8accacb16860cf6961016c1f52
|
||||||
#include "chrome/browser/shell_integration_win.h"
|
#include "chrome/browser/shell_integration_win.h"
|
||||||
#include "content/public/browser/render_widget_host_view.h"
|
#include "content/public/browser/render_widget_host_view.h"
|
||||||
#include "ui/aura/window.h"
|
#include "ui/aura/window.h"
|
||||||
@@ -314,7 +316,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
@@ -315,7 +317,7 @@ std::unique_ptr<VideoOverlayWindowViews> VideoOverlayWindowViews::Create(
|
||||||
overlay_window->Init(std::move(params));
|
overlay_window->Init(std::move(params));
|
||||||
overlay_window->OnRootViewReady();
|
overlay_window->OnRootViewReady();
|
||||||
|
|
||||||
|
|
|
@ -676,7 +676,7 @@ index 3c2fdc9f9a6c60efc4b0afacbfb83eef55917791..8fd9aff538fa03da6c171927c316d4f6
|
||||||
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
||||||
|
|
||||||
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
||||||
index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b62839358 100644
|
index a56221b3d7ed30ba20766f902a934f47e71c63a3..c45900640ffa0baa61acc1341a963f0a4e136b27 100644
|
||||||
--- a/components/printing/renderer/print_render_frame_helper.cc
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
||||||
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
||||||
@@ -51,6 +51,7 @@
|
@@ -51,6 +51,7 @@
|
||||||
|
@ -687,7 +687,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
#include "printing/units.h"
|
#include "printing/units.h"
|
||||||
#include "services/metrics/public/cpp/ukm_source_id.h"
|
#include "services/metrics/public/cpp/ukm_source_id.h"
|
||||||
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
||||||
@@ -1222,14 +1223,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
@@ -1225,14 +1226,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||||
}
|
}
|
||||||
|
|
||||||
print_in_progress_ = true;
|
print_in_progress_ = true;
|
||||||
|
@ -704,7 +704,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
if (!weak_this) {
|
if (!weak_this) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1260,12 +1261,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
@@ -1263,12 +1264,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||||
receivers_.Add(this, std::move(receiver));
|
receivers_.Add(this, std::move(receiver));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -722,7 +722,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
||||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
||||||
return;
|
return;
|
||||||
@@ -1282,9 +1285,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
@@ -1285,9 +1288,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||||
|
|
||||||
is_loading_ = frame->WillPrintSoon();
|
is_loading_ = frame->WillPrintSoon();
|
||||||
if (is_loading_) {
|
if (is_loading_) {
|
||||||
|
@ -736,7 +736,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
SetupOnStopLoadingTimeout();
|
SetupOnStopLoadingTimeout();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1294,7 +1298,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
@@ -1297,7 +1301,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||||
// plugin node and print that instead.
|
// plugin node and print that instead.
|
||||||
auto plugin = delegate_->GetPdfElement(frame);
|
auto plugin = delegate_->GetPdfElement(frame);
|
||||||
|
|
||||||
|
@ -745,7 +745,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
|
|
||||||
if (render_frame_gone_) {
|
if (render_frame_gone_) {
|
||||||
return;
|
return;
|
||||||
@@ -1451,6 +1455,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
@@ -1454,6 +1458,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -754,7 +754,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
print_preview_context_.OnPrintPreview();
|
print_preview_context_.OnPrintPreview();
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
@@ -2043,17 +2049,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
@@ -2046,17 +2052,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||||
|
|
||||||
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||||
const blink::WebNode& node,
|
const blink::WebNode& node,
|
||||||
|
@ -777,7 +777,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2074,8 +2082,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
@@ -2077,8 +2085,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||||
print_pages_params_->params->print_scaling_option;
|
print_pages_params_->params->print_scaling_option;
|
||||||
|
|
||||||
auto self = weak_ptr_factory_.GetWeakPtr();
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
||||||
|
@ -794,7 +794,7 @@ index cd4a61255d677784f93d831b619c07f2682162ec..49452c0467adb8a086d3d1c3c823cf8b
|
||||||
// Check if `this` is still valid.
|
// Check if `this` is still valid.
|
||||||
if (!self)
|
if (!self)
|
||||||
return;
|
return;
|
||||||
@@ -2336,29 +2351,37 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
@@ -2339,29 +2354,37 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
||||||
|
@ -883,10 +883,10 @@ index 14de029740ffbebe06d309651c1a2c007d9fb96b..e9bf9c5bef2a9235260e7d6c8d26d415
|
||||||
ScriptingThrottler scripting_throttler_;
|
ScriptingThrottler scripting_throttler_;
|
||||||
|
|
||||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||||
index 6cc8915935323c1fee2638753ac3c353cbe1be69..529ac6b29e457ed1b4c17360f80415c4729bcd85 100644
|
index 3c3dfc789890eda3007c0723e6730e5fb88c4646..00e4d081a6afac7414cb91d7d5bb276881f49ea0 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -3022,8 +3022,9 @@ source_set("browser") {
|
@@ -3025,8 +3025,9 @@ source_set("browser") {
|
||||||
"//ppapi/shared_impl",
|
"//ppapi/shared_impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -44,10 +44,10 @@ index 220cf4c17885da4b4f312709d3eff260100b9726..dc34e96861a95abccf9b63df0e73c810
|
||||||
|
|
||||||
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 5927ad75e9d7d5f0e69a7c5165c3637a966db930..f683fdc187934fde7c67c6722b36c85ce993119d 100644
|
index 30f60283002c6b0fb540a47def95e8496dccebdb..5bcf895fbcc395ab664e208772e0fe5a9f99e153 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -5449,6 +5449,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
@@ -5451,6 +5451,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
||||||
return text_input_manager_.get();
|
return text_input_manager_.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,10 +60,10 @@ index 5927ad75e9d7d5f0e69a7c5165c3637a966db930..f683fdc187934fde7c67c6722b36c85c
|
||||||
RenderWidgetHostImpl* render_widget_host) {
|
RenderWidgetHostImpl* render_widget_host) {
|
||||||
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
|
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
||||||
index abf97090109393b0a1a029d602851a3138abc39d..43d2eb6c9c0c8333ac649d57f22213e8b5b60358 100644
|
index d223145c0d62db4311b13c60098ffd0b043b376c..ac8df36e9bef3dc4dd52b63d2db7ea3a9f3162ce 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.h
|
--- a/content/browser/web_contents/web_contents_impl.h
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.h
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
||||||
@@ -1109,6 +1109,7 @@ class CONTENT_EXPORT WebContentsImpl
|
@@ -1107,6 +1107,7 @@ class CONTENT_EXPORT WebContentsImpl
|
||||||
void SendScreenRects() override;
|
void SendScreenRects() override;
|
||||||
void SendActiveState(bool active) override;
|
void SendActiveState(bool active) override;
|
||||||
TextInputManager* GetTextInputManager() override;
|
TextInputManager* GetTextInputManager() override;
|
||||||
|
@ -72,7 +72,7 @@ index abf97090109393b0a1a029d602851a3138abc39d..43d2eb6c9c0c8333ac649d57f22213e8
|
||||||
RenderWidgetHostImpl* render_widget_host) override;
|
RenderWidgetHostImpl* render_widget_host) override;
|
||||||
bool IsShowingContextMenuOnPage() const override;
|
bool IsShowingContextMenuOnPage() const override;
|
||||||
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
|
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
|
||||||
index 0fdc42b4c027ee17e98dada04dee5d018f4003e6..03e55751526db0c1771fb17ac957e83f4b308363 100644
|
index c780eb133181dc2c94c07723244c8db4f938247a..56939f97cb41e1f0136fe97300cc30519a19723e 100644
|
||||||
--- a/content/public/browser/web_contents_observer.h
|
--- a/content/public/browser/web_contents_observer.h
|
||||||
+++ b/content/public/browser/web_contents_observer.h
|
+++ b/content/public/browser/web_contents_observer.h
|
||||||
@@ -33,6 +33,7 @@
|
@@ -33,6 +33,7 @@
|
||||||
|
|
|
@ -8,7 +8,7 @@ it in Electron and prevent drift from Chrome's blocklist. We should look for a w
|
||||||
to upstream this change to Chrome.
|
to upstream this change to Chrome.
|
||||||
|
|
||||||
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||||
index 22ae6223d89316fe4fe419c54e201111275671cf..a95bd243ab43cd1878cd62e76999e706d3b084ec 100644
|
index f6c1502ef5c782fa435e35dc05e5024c38881028..bcd81f8d78b9745aa883508a51c2a0d0505dae20 100644
|
||||||
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||||
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||||
@@ -42,7 +42,6 @@
|
@@ -42,7 +42,6 @@
|
||||||
|
|
|
@ -52,10 +52,10 @@ Some alternatives to this patch:
|
||||||
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
|
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
|
||||||
|
|
||||||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||||||
index 19c940ccf37f16804e16d1c54a638d1c6f13384d..a79561241a182e5e168201598aef29dd2fff3d02 100644
|
index ef70be5f9e11d4f24668ff25ed3c25eeeeeb3c57..78923a81c64fb7738f4e457e3166a88f3c150564 100644
|
||||||
--- a/chrome/BUILD.gn
|
--- a/chrome/BUILD.gn
|
||||||
+++ b/chrome/BUILD.gn
|
+++ b/chrome/BUILD.gn
|
||||||
@@ -1581,7 +1581,7 @@ if (is_chrome_branded && !is_android) {
|
@@ -1585,7 +1585,7 @@ if (is_chrome_branded && !is_android) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ index 19c940ccf37f16804e16d1c54a638d1c6f13384d..a79561241a182e5e168201598aef29dd
|
||||||
chrome_paks("packed_resources") {
|
chrome_paks("packed_resources") {
|
||||||
if (is_mac) {
|
if (is_mac) {
|
||||||
output_dir = "$root_gen_dir/repack"
|
output_dir = "$root_gen_dir/repack"
|
||||||
@@ -1620,6 +1620,12 @@ if (!is_android) {
|
@@ -1624,6 +1624,12 @@ if (!is_android) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch
|
||||||
Patch to make scrollBounce option work.
|
Patch to make scrollBounce option work.
|
||||||
|
|
||||||
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
||||||
index c8bdd54e22b9b5af03fb84d50614c54f778e0d78..252ddae46cebaa6a7864aa24970482c4eade217a 100644
|
index 2ffea4d9b7890ff6760c4226875adfbda90d476b..c3cf1992340c8f844d6540068264fa97dbca6958 100644
|
||||||
--- a/content/renderer/render_thread_impl.cc
|
--- a/content/renderer/render_thread_impl.cc
|
||||||
+++ b/content/renderer/render_thread_impl.cc
|
+++ b/content/renderer/render_thread_impl.cc
|
||||||
@@ -1281,7 +1281,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
@@ -1281,7 +1281,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
|
||||||
|
|
|
@ -9,10 +9,10 @@ is needed for OSR.
|
||||||
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index fd884becfbb7b36e99e9df3dfe00602bf3ddb8a6..4897344f95e10c8a94c4b0cf71dfe772e71ad104 100644
|
index e3246011d776a8242530b117a55d0c909277a6d5..b35f23dd329f700eb85e5d206ac78cb0be4f2a19 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3638,6 +3638,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3640,6 +3640,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
||||||
base::UnguessableToken::Create());
|
base::UnguessableToken::Create());
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ index fd884becfbb7b36e99e9df3dfe00602bf3ddb8a6..4897344f95e10c8a94c4b0cf71dfe772
|
||||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -3648,6 +3655,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3650,6 +3657,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||||
&render_view_host_delegate_view_);
|
&render_view_host_delegate_view_);
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ index fd884becfbb7b36e99e9df3dfe00602bf3ddb8a6..4897344f95e10c8a94c4b0cf71dfe772
|
||||||
CHECK(view_.get());
|
CHECK(view_.get());
|
||||||
|
|
||||||
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
||||||
index 571819688a32b9bf9cd8f7511bd6645b9d13ebff..b7ded85102b79ea7290b7a27936b9e78348ca14d 100644
|
index cb42c99bacb204ef9573b3845673971c72f0344a..5258c9f6b5a1be7e5aa4ee850adcbd3c7d3864f0 100644
|
||||||
--- a/content/public/browser/web_contents.h
|
--- a/content/public/browser/web_contents.h
|
||||||
+++ b/content/public/browser/web_contents.h
|
+++ b/content/public/browser/web_contents.h
|
||||||
@@ -109,10 +109,13 @@ class BrowserContext;
|
@@ -109,10 +109,13 @@ class BrowserContext;
|
||||||
|
|
|
@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
|
||||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
`api::WebContents::IsFullscreenForTabOrPending` value.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index bc39bd106a9d227a378c31248a263315b8179fc4..33d3f54069b0ad2d6b752cf75101d82dda778ecc 100644
|
index 7a436aa00f9a54ff04dc05f0a49776b6acc81c1e..8635932b649e575ccf98beb1b43afa3ba9d6e194 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -8024,6 +8024,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -8030,6 +8030,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ index bc39bd106a9d227a378c31248a263315b8179fc4..33d3f54069b0ad2d6b752cf75101d82d
|
||||||
if (had_fullscreen_token && !GetView()->HasFocus())
|
if (had_fullscreen_token && !GetView()->HasFocus())
|
||||||
GetView()->Focus();
|
GetView()->Focus();
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 4897344f95e10c8a94c4b0cf71dfe772e71ad104..5ef6e65f6e399f1bc718100015db4baf206ffa4a 100644
|
index b35f23dd329f700eb85e5d206ac78cb0be4f2a19..9ff1f515733c6459666170d47899f44e8605f775 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3893,21 +3893,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
|
@@ -3895,21 +3895,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
|
||||||
const input::NativeWebKeyboardEvent& event) {
|
const input::NativeWebKeyboardEvent& event) {
|
||||||
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
|
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
|
||||||
"WebContentsImpl::PreHandleKeyboardEvent");
|
"WebContentsImpl::PreHandleKeyboardEvent");
|
||||||
|
@ -78,7 +78,7 @@ index 4897344f95e10c8a94c4b0cf71dfe772e71ad104..5ef6e65f6e399f1bc718100015db4baf
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
||||||
@@ -4066,7 +4070,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
@@ -4068,7 +4072,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
||||||
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
|
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
|
||||||
DCHECK(CanEnterFullscreenMode(requesting_frame));
|
DCHECK(CanEnterFullscreenMode(requesting_frame));
|
||||||
DCHECK(requesting_frame->IsActive());
|
DCHECK(requesting_frame->IsActive());
|
||||||
|
|
|
@ -26,10 +26,10 @@ index 784e0a5166d6bece3f6a251e7cab1192e576af22..efd8ef49f1f2b6ecd6c3638b56e40c4e
|
||||||
// An empty URL is returned if the URL is not overriden.
|
// An empty URL is returned if the URL is not overriden.
|
||||||
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
|
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
index 8ad54eacf1ec5ff94d3f85484cce9c80103ce3d4..7490df0c5fa6a0f3b292a130f1930f537ac186a3 100644
|
index da2515e0067a977691227bfacb3643cf1c23cc5c..f892e242564d33766ab94aa466460df4bebaf929 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.cc
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
@@ -902,6 +902,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
@@ -881,6 +881,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
||||||
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,10 +43,10 @@ index 8ad54eacf1ec5ff94d3f85484cce9c80103ce3d4..7490df0c5fa6a0f3b292a130f1930f53
|
||||||
const v8::Local<v8::Context>& worker) {
|
const v8::Local<v8::Context>& worker) {
|
||||||
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
|
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
||||||
index b2eae6bcf84a68f60ad00f5a84a7bcda42b6c7aa..4514bae97793815bc5ae0e94819253f7b5374116 100644
|
index 69c52cb8333fc8e967631c2f9535e8f15a421ee0..937714ced2e73ae3950c35e012f633d916de6f5c 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.h
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.h
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
||||||
@@ -197,6 +197,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -195,6 +195,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||||
void DidStartWorkerThread() override;
|
void DidStartWorkerThread() override;
|
||||||
void WillStopWorkerThread() override;
|
void WillStopWorkerThread() override;
|
||||||
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
||||||
|
@ -55,10 +55,10 @@ index b2eae6bcf84a68f60ad00f5a84a7bcda42b6c7aa..4514bae97793815bc5ae0e94819253f7
|
||||||
const blink::WebSecurityOrigin& script_origin) override;
|
const blink::WebSecurityOrigin& script_origin) override;
|
||||||
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel(
|
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel(
|
||||||
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
||||||
index cbc11108212e72e569503f3b1a746b37e4305274..2b8bb13dda4c66d9b7e16a5faf779083b19f0b7d 100644
|
index 700e93a9ed053e4141658c86a26ec230aed42916..394b2f06501f52478614ba6565dfae47b3ce1e8f 100644
|
||||||
--- a/third_party/blink/public/platform/platform.h
|
--- a/third_party/blink/public/platform/platform.h
|
||||||
+++ b/third_party/blink/public/platform/platform.h
|
+++ b/third_party/blink/public/platform/platform.h
|
||||||
@@ -670,6 +670,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
@@ -662,6 +662,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||||
virtual void DidStartWorkerThread() {}
|
virtual void DidStartWorkerThread() {}
|
||||||
virtual void WillStopWorkerThread() {}
|
virtual void WillStopWorkerThread() {}
|
||||||
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
||||||
|
|
|
@ -35,10 +35,10 @@ index efd8ef49f1f2b6ecd6c3638b56e40c4e418f3493..9d8a1947e371d085486c1c4e27edfb03
|
||||||
// from the worker thread.
|
// from the worker thread.
|
||||||
virtual void WillDestroyWorkerContextOnWorkerThread(
|
virtual void WillDestroyWorkerContextOnWorkerThread(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
index 7490df0c5fa6a0f3b292a130f1930f537ac186a3..f8619a6fa8b735884483290a3875280d6090d5e8 100644
|
index f892e242564d33766ab94aa466460df4bebaf929..d2fb42a27d51e1bb4725fce3aea9387f8f9a3017 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.cc
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
||||||
@@ -914,6 +914,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
@@ -893,6 +893,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
||||||
worker);
|
worker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,10 +52,10 @@ index 7490df0c5fa6a0f3b292a130f1930f537ac186a3..f8619a6fa8b735884483290a3875280d
|
||||||
const blink::WebSecurityOrigin& script_origin) {
|
const blink::WebSecurityOrigin& script_origin) {
|
||||||
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
|
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
|
||||||
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
||||||
index 4514bae97793815bc5ae0e94819253f7b5374116..9738e154823fd438730485b1b1d24932d45e9518 100644
|
index 937714ced2e73ae3950c35e012f633d916de6f5c..811390014521eeeb98bb122d827d652d7230622d 100644
|
||||||
--- a/content/renderer/renderer_blink_platform_impl.h
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
||||||
+++ b/content/renderer/renderer_blink_platform_impl.h
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
||||||
@@ -197,6 +197,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -195,6 +195,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
||||||
void DidStartWorkerThread() override;
|
void DidStartWorkerThread() override;
|
||||||
void WillStopWorkerThread() override;
|
void WillStopWorkerThread() override;
|
||||||
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
||||||
|
@ -65,10 +65,10 @@ index 4514bae97793815bc5ae0e94819253f7b5374116..9738e154823fd438730485b1b1d24932
|
||||||
bool AllowScriptExtensionForServiceWorker(
|
bool AllowScriptExtensionForServiceWorker(
|
||||||
const blink::WebSecurityOrigin& script_origin) override;
|
const blink::WebSecurityOrigin& script_origin) override;
|
||||||
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
||||||
index 2b8bb13dda4c66d9b7e16a5faf779083b19f0b7d..26d8496e05659a1a4fdb3ee5f664dc7d7314046b 100644
|
index 394b2f06501f52478614ba6565dfae47b3ce1e8f..46a8c958c0f896a42106f73ce13171eefbd0f662 100644
|
||||||
--- a/third_party/blink/public/platform/platform.h
|
--- a/third_party/blink/public/platform/platform.h
|
||||||
+++ b/third_party/blink/public/platform/platform.h
|
+++ b/third_party/blink/public/platform/platform.h
|
||||||
@@ -670,6 +670,8 @@ class BLINK_PLATFORM_EXPORT Platform {
|
@@ -662,6 +662,8 @@ class BLINK_PLATFORM_EXPORT Platform {
|
||||||
virtual void DidStartWorkerThread() {}
|
virtual void DidStartWorkerThread() {}
|
||||||
virtual void WillStopWorkerThread() {}
|
virtual void WillStopWorkerThread() {}
|
||||||
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
||||||
|
|
|
@ -42,7 +42,7 @@ index 57a9dca1a84dee95d36c2b296fc170399db3e213..5db78a650068faa0bacf05b13d86860c
|
||||||
#endif
|
#endif
|
||||||
if (!scope->is_function_scope() ||
|
if (!scope->is_function_scope() ||
|
||||||
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
|
diff --git a/src/flags/flag-definitions.h b/src/flags/flag-definitions.h
|
||||||
index fe346c46296c9b665e0a2bdd5127e929f6c91b3c..80790f627c069572f87a803bb16a312ae75e3dbe 100644
|
index 670cb9f3658737acd953a4dcbb502c407a79212b..42765a8069d62df908ada15b3b89b7d8476744bb 100644
|
||||||
--- a/src/flags/flag-definitions.h
|
--- a/src/flags/flag-definitions.h
|
||||||
+++ b/src/flags/flag-definitions.h
|
+++ b/src/flags/flag-definitions.h
|
||||||
@@ -964,7 +964,12 @@ DEFINE_BOOL(trace_track_allocation_sites, false,
|
@@ -964,7 +964,12 @@ DEFINE_BOOL(trace_track_allocation_sites, false,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче