chore: bump chromium to 114.0.5719.0 (main) (#38017)
* chore: bump chromium in DEPS to 114.0.5719.0 * chore: update patches * revert eb07a797ccea2bc46b94cbc875173801cc5eefee --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
parent
de192c2db2
commit
b2411e05a8
31 changed files with 88 additions and 100 deletions
|
@ -524,18 +524,6 @@ step-fix-sync: &step-fix-sync
|
||||||
mv .git/config.backup .git/config
|
mv .git/config.backup .git/config
|
||||||
git fetch
|
git fetch
|
||||||
|
|
||||||
step-fix-clang: &step-fix-clang
|
|
||||||
run:
|
|
||||||
name: Fix Clang on 32-bit Linux ARM
|
|
||||||
command: |
|
|
||||||
if [ "$TARGET_ARCH" == "arm" ]; then
|
|
||||||
# The following custom clang needed on 32-bit Linux ARM due to https://crbug.com/1431201.
|
|
||||||
# Once https://crbug.com/1425409 has been resolved this workaround can be remove
|
|
||||||
cd src/third_party/llvm-build/Release+Asserts
|
|
||||||
curl -O https://dev-cdn.electronjs.org/clang/clang-llvmorg-17-init-4759-g547e3456-2.tar.xz
|
|
||||||
tar xvf clang-llvmorg-17-init-4759-g547e3456-2.tar.xz
|
|
||||||
fi
|
|
||||||
|
|
||||||
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
|
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
|
||||||
run:
|
run:
|
||||||
name: Import and trust self-signed codesigning cert on MacOS
|
name: Import and trust self-signed codesigning cert on MacOS
|
||||||
|
@ -1068,7 +1056,6 @@ commands:
|
||||||
default: true
|
default: true
|
||||||
steps:
|
steps:
|
||||||
- *step-gn-gen-default
|
- *step-gn-gen-default
|
||||||
- *step-fix-clang
|
|
||||||
- ninja_build_electron:
|
- ninja_build_electron:
|
||||||
clean-prebuilt-snapshot: false
|
clean-prebuilt-snapshot: false
|
||||||
build-type: << parameters.build-type >>
|
build-type: << parameters.build-type >>
|
||||||
|
@ -1611,7 +1598,6 @@ commands:
|
||||||
- *step-setup-goma-for-build
|
- *step-setup-goma-for-build
|
||||||
- *step-wait-for-goma
|
- *step-wait-for-goma
|
||||||
- *step-gn-gen-default
|
- *step-gn-gen-default
|
||||||
- *step-fix-clang
|
|
||||||
|
|
||||||
# Electron app
|
# Electron app
|
||||||
- ninja_build_electron:
|
- ninja_build_electron:
|
||||||
|
|
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'114.0.5715.0',
|
'114.0.5719.0',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v18.16.0',
|
'v18.16.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -23,10 +23,10 @@ index fef4c8e02067c44ed804c8b53db1007fae2d2a76..b36304ee0a832c5e1e2fd3af6151b7b0
|
||||||
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 f45f542fa3131036624686cd33a90097e6400ff5..0bdf1012eea9d754e03d9b6d9f05a1939502e6b1 100644
|
index 456304cef9e3a8063b112b3f4cfabc25d9d479d4..03cc4d80913201828aba0c60940f4784b0b788b3 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
|
||||||
@@ -4418,6 +4418,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
@@ -4417,6 +4417,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
||||||
observer.DidCreateScriptContext(context, world_id);
|
observer.DidCreateScriptContext(context, world_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,10 +49,10 @@ index 22c4d4e9718a503d9c7ca26a40c97149b0f8986a..6bdc2757c96a28022fda9e6f5e3b74a0
|
||||||
// its owning reference back to our owning LocalFrame.
|
// its owning reference back to our owning LocalFrame.
|
||||||
client_->Detached(type);
|
client_->Detached(type);
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index 8244852a9728bd7a6e34f0c499b567c7051d5bcc..b1bb027294305c7cc10018d12ace9df80dca1698 100644
|
index c1a1bc822294940dbfdeef19ad082a17dc98325c..780e573751d6b7cee1ff751746f57f039649e96b 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -624,10 +624,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -625,10 +625,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
}
|
}
|
||||||
DCHECK(!view_ || !view_->IsAttached());
|
DCHECK(!view_ || !view_->IsAttached());
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ index 8244852a9728bd7a6e34f0c499b567c7051d5bcc..b1bb027294305c7cc10018d12ace9df8
|
||||||
if (!Client())
|
if (!Client())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -675,6 +671,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -676,6 +672,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
DCHECK(!view_->IsAttached());
|
DCHECK(!view_->IsAttached());
|
||||||
Client()->WillBeDetached();
|
Client()->WillBeDetached();
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,10 @@ index 98c9dca792522fd27774d9d22ead61ee546b1832..d255787f554b71cb9034229212f80b0f
|
||||||
"//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 11c1bb988e14b7c7d2034625a441e47bfdd84fe4..eb1e410aaeab7fccbb128c9c302e606dc0c2b274 100644
|
index 09f96b22f60fac75a1d194a6ee40346e3841c5c6..f9f2a0801b4140080142d4116995bee66e157cd7 100644
|
||||||
--- a/chrome/browser/BUILD.gn
|
--- a/chrome/browser/BUILD.gn
|
||||||
+++ b/chrome/browser/BUILD.gn
|
+++ b/chrome/browser/BUILD.gn
|
||||||
@@ -4573,7 +4573,7 @@ static_library("browser") {
|
@@ -4571,7 +4571,7 @@ static_library("browser") {
|
||||||
|
|
||||||
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
|
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
|
||||||
# than here in :chrome_dll.
|
# than here in :chrome_dll.
|
||||||
|
@ -46,10 +46,10 @@ index 11c1bb988e14b7c7d2034625a441e47bfdd84fe4..eb1e410aaeab7fccbb128c9c302e606d
|
||||||
sources += [ "certificate_viewer_stub.cc" ]
|
sources += [ "certificate_viewer_stub.cc" ]
|
||||||
}
|
}
|
||||||
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 68e7482bea27a064a91eeb0cf3f31b799f4d6458..b21885938cee918342dcdb702436de441e88861c 100644
|
index 67fb2ff53b6145cee2e310592828d3b6337d5b17..85d6e319598edf1b5b1b80ccb3092154a3b54cb5 100644
|
||||||
--- a/chrome/test/BUILD.gn
|
--- a/chrome/test/BUILD.gn
|
||||||
+++ b/chrome/test/BUILD.gn
|
+++ b/chrome/test/BUILD.gn
|
||||||
@@ -6410,7 +6410,6 @@ test("unit_tests") {
|
@@ -6413,7 +6413,6 @@ test("unit_tests") {
|
||||||
|
|
||||||
deps += [
|
deps += [
|
||||||
"//chrome:other_version",
|
"//chrome:other_version",
|
||||||
|
@ -57,7 +57,7 @@ index 68e7482bea27a064a91eeb0cf3f31b799f4d6458..b21885938cee918342dcdb702436de44
|
||||||
"//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",
|
||||||
@@ -6436,6 +6435,10 @@ test("unit_tests") {
|
@@ -6439,6 +6438,10 @@ test("unit_tests") {
|
||||||
"//ui/resources",
|
"//ui/resources",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ index 68e7482bea27a064a91eeb0cf3f31b799f4d6458..b21885938cee918342dcdb702436de44
|
||||||
ldflags = [
|
ldflags = [
|
||||||
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
|
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
|
||||||
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
|
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
|
||||||
@@ -7361,7 +7364,6 @@ test("unit_tests") {
|
@@ -7364,7 +7367,6 @@ test("unit_tests") {
|
||||||
}
|
}
|
||||||
|
|
||||||
deps += [
|
deps += [
|
||||||
|
@ -76,7 +76,7 @@ index 68e7482bea27a064a91eeb0cf3f31b799f4d6458..b21885938cee918342dcdb702436de44
|
||||||
"//chrome/browser/apps:icon_standardizer",
|
"//chrome/browser/apps:icon_standardizer",
|
||||||
"//chrome/browser/apps/app_service",
|
"//chrome/browser/apps/app_service",
|
||||||
"//chrome/browser/apps/app_service:test_support",
|
"//chrome/browser/apps/app_service:test_support",
|
||||||
@@ -7440,6 +7442,10 @@ test("unit_tests") {
|
@@ -7443,6 +7445,10 @@ test("unit_tests") {
|
||||||
"//ui/webui/resources/js/browser_command:mojo_bindings",
|
"//ui/webui/resources/js/browser_command:mojo_bindings",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: build: only use the mas build config in the required components
|
||||||
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
|
Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
|
||||||
|
|
||||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||||
index b03c972351eda4bdaf20bc33c340e83d4c597f8f..8b26340bc4d587142206814d3109001e0c7b9839 100644
|
index 38103227e6036efec56424223d7ca1b3aceb8a89..9dd0e0f1a0ed794cf3cff2af78c97511935d5b81 100644
|
||||||
--- a/base/BUILD.gn
|
--- a/base/BUILD.gn
|
||||||
+++ b/base/BUILD.gn
|
+++ b/base/BUILD.gn
|
||||||
@@ -1030,6 +1030,7 @@ component("base") {
|
@@ -1032,6 +1032,7 @@ component("base") {
|
||||||
"//build/config/compiler:prevent_unsafe_narrowing",
|
"//build/config/compiler:prevent_unsafe_narrowing",
|
||||||
"//build/config/compiler:wexit_time_destructors",
|
"//build/config/compiler:wexit_time_destructors",
|
||||||
"//build/config/compiler:wglobal_constructors",
|
"//build/config/compiler:wglobal_constructors",
|
||||||
|
@ -76,7 +76,7 @@ index 8c8c29706ebec0be7ca25d63fc5e8af4a212e8bc..66fd728dc1ec5079a8d227f4e88d0d38
|
||||||
|
|
||||||
if (is_win) {
|
if (is_win) {
|
||||||
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 7274b2166905e5d61de8daef5ff2e71effd427a1..282395a2682448907a3f22ebe8a887c143dcb388 100644
|
index fce93ca350d0fa6235f740a8c8ca67b2943a1a30..231b38fba003ad36a4914d615105bd35e8c45b0f 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -56,6 +56,7 @@ source_set("browser") {
|
@@ -56,6 +56,7 @@ source_set("browser") {
|
||||||
|
|
|
@ -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 0e13e4cddce57b7d004241d2619ee83358d87a39..df28eb7e3b2f4c7030ef5363dd68c1c2c7db2cac 100644
|
index 8accd729b4f39c738b722d36bc0bbe769e598cba..2937f35372bafd9158be712f04d2731bb4100f9a 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
|
||||||
@@ -7710,6 +7710,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -7711,6 +7711,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,
|
||||||
|
@ -66,7 +66,7 @@ index 12f4a2066a2a31e9852216c0cb3344095c7b0e39..588ca46227c58f9596317d6d4d05d0b3
|
||||||
|
|
||||||
// Operation result when the renderer asks the browser to create a new window.
|
// 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
|
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
||||||
index 8182fa1e9ec189fb181e3c32b6a96c10011a49e1..764287eeb851136bd5ea5143fc5b4f9e675fce49 100644
|
index abc759cc548276accc0869b67c55d1078cf4c097..36e70e69615a4463afdb7b069b60f20d010dfb27 100644
|
||||||
--- a/content/public/browser/content_browser_client.cc
|
--- a/content/public/browser/content_browser_client.cc
|
||||||
+++ b/content/public/browser/content_browser_client.cc
|
+++ b/content/public/browser/content_browser_client.cc
|
||||||
@@ -631,6 +631,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
@@ -631,6 +631,8 @@ bool ContentBrowserClient::CanCreateWindow(
|
||||||
|
@ -79,7 +79,7 @@ index 8182fa1e9ec189fb181e3c32b6a96c10011a49e1..764287eeb851136bd5ea5143fc5b4f9e
|
||||||
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 3a843b83b86f868998ea9c2289874eb89fdec41a..b0534cbc6754f313b798436b39146da59d3fb32c 100644
|
index 6fc121fb5f3a418763df5042619f89cae0551a00..d89b97d141c66696caa5535b03f4da994fd28210 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
|
||||||
@@ -165,6 +165,7 @@ class NetworkService;
|
@@ -165,6 +165,7 @@ class NetworkService;
|
||||||
|
@ -90,7 +90,7 @@ index 3a843b83b86f868998ea9c2289874eb89fdec41a..b0534cbc6754f313b798436b39146da5
|
||||||
} // namespace network
|
} // namespace network
|
||||||
|
|
||||||
namespace sandbox {
|
namespace sandbox {
|
||||||
@@ -1031,6 +1032,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
@@ -1032,6 +1033,8 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||||
const std::string& frame_name,
|
const std::string& frame_name,
|
||||||
WindowOpenDisposition disposition,
|
WindowOpenDisposition disposition,
|
||||||
const blink::mojom::WindowFeatures& features,
|
const blink::mojom::WindowFeatures& features,
|
||||||
|
@ -148,10 +148,10 @@ index 5da6f93293bc5ddae88c17ac2dd8d7037ba8e8f3..76d699790fb7d92587293b14332f696d
|
||||||
// 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 0a0aa8f85c5c818fffc310f4d05a6886f7d6272b..f45f542fa3131036624686cd33a90097e6400ff5 100644
|
index 3257ffeafbc86eb728e58498a2c2283eabf305f3..456304cef9e3a8063b112b3f4cfabc25d9d479d4 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
|
||||||
@@ -6318,6 +6318,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
@@ -6317,6 +6317,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
||||||
blink::GetNavigationInitiatorActivationAndAdStatus(
|
blink::GetNavigationInitiatorActivationAndAdStatus(
|
||||||
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());
|
request.HasUserGesture(), GetWebFrame()->IsAdScriptInStack());
|
||||||
|
|
||||||
|
|
|
@ -102,10 +102,10 @@ index d4bb0e9a017a833b403916e1d6e64fb058f40f86..35ba35a95e39700824d6e0b480b99bc3
|
||||||
friend class ContentClientCreator;
|
friend class ContentClientCreator;
|
||||||
friend class ContentClientInitializer;
|
friend class ContentClientInitializer;
|
||||||
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
||||||
index ae8116dae33d0e7340e526263de86a4b181f1a19..d5385860f5f4496709d47560c3d6d0dd6dbc525b 100644
|
index f65c0fd59dfe3029fe47d3401759298e75243839..76dcbe2873f3e995cc612cbcd7eba60f236f655d 100644
|
||||||
--- a/gin/v8_initializer.cc
|
--- a/gin/v8_initializer.cc
|
||||||
+++ b/gin/v8_initializer.cc
|
+++ b/gin/v8_initializer.cc
|
||||||
@@ -503,8 +503,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
|
@@ -506,8 +506,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
|
||||||
|
|
||||||
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ index ae8116dae33d0e7340e526263de86a4b181f1a19..d5385860f5f4496709d47560c3d6d0dd
|
||||||
if (g_mapped_snapshot) {
|
if (g_mapped_snapshot) {
|
||||||
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
|
// TODO(crbug.com/802962): Confirm not loading different type of snapshot
|
||||||
// files in a process.
|
// files in a process.
|
||||||
@@ -513,10 +512,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
|
@@ -516,10 +515,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
|
||||||
|
|
||||||
base::MemoryMappedFile::Region file_region;
|
base::MemoryMappedFile::Region file_region;
|
||||||
base::File file =
|
base::File file =
|
||||||
|
|
|
@ -15,10 +15,10 @@ at some point be an API to "unfreeze" the flags, or we may be able to refactor
|
||||||
node initialization to not update flags after V8 initialization.
|
node initialization to not update flags after V8 initialization.
|
||||||
|
|
||||||
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
|
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
|
||||||
index 94016c74d962d7e5459ff5457f276e6742146280..0ca99a62d1289f9eff38291bd7af23cefd9cf77d 100644
|
index 15928985bed40a7e0a26d9ab09f44f86ed3f3bd6..612616264b1caf097a4d45a4ba09e312b10e7acf 100644
|
||||||
--- a/content/renderer/render_process_impl.cc
|
--- a/content/renderer/render_process_impl.cc
|
||||||
+++ b/content/renderer/render_process_impl.cc
|
+++ b/content/renderer/render_process_impl.cc
|
||||||
@@ -231,6 +231,9 @@ RenderProcessImpl::RenderProcessImpl()
|
@@ -228,6 +228,9 @@ RenderProcessImpl::RenderProcessImpl()
|
||||||
v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
|
v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ index 574434c94e0ee145c9a86566baa04d1c054b0dff..5a15c65967b73e54ea742c4f44ee40dd
|
||||||
void SetEnableReferrers(bool enable_referrers) override;
|
void SetEnableReferrers(bool enable_referrers) override;
|
||||||
#if BUILDFLAG(IS_CHROMEOS)
|
#if BUILDFLAG(IS_CHROMEOS)
|
||||||
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
||||||
index 3b9d7b94d93b7d9f8f5ae54c76fd533d151d54c3..71310fe11c0dfe605c728ab504508d433e73f303 100644
|
index 8d8899d941050868c80642d6589e4e3bc48462c7..411282b43eaee28d4091510777c83897e0e844fc 100644
|
||||||
--- a/services/network/public/mojom/network_context.mojom
|
--- a/services/network/public/mojom/network_context.mojom
|
||||||
+++ b/services/network/public/mojom/network_context.mojom
|
+++ b/services/network/public/mojom/network_context.mojom
|
||||||
@@ -1119,6 +1119,9 @@ interface NetworkContext {
|
@@ -1119,6 +1119,9 @@ interface NetworkContext {
|
||||||
|
|
|
@ -13,7 +13,7 @@ uses internally for things like menus and devtools.
|
||||||
We can remove this patch once it has in some shape been upstreamed.
|
We can remove this patch once it has in some shape been upstreamed.
|
||||||
|
|
||||||
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
|
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
|
||||||
index 972b8416c2d6d6bc412567675ba8bb61ba7bec70..a102e864239ab8ac67814c38cedf2e742e05eeeb 100644
|
index 4c60eb7caf5eddbdb71b753c710c7053476bee04..88dd58492d84c6da4f179a5ef651923ab17a76b1 100644
|
||||||
--- a/ui/native_theme/native_theme.cc
|
--- a/ui/native_theme/native_theme.cc
|
||||||
+++ b/ui/native_theme/native_theme.cc
|
+++ b/ui/native_theme/native_theme.cc
|
||||||
@@ -144,6 +144,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
|
@@ -144,6 +144,8 @@ NativeTheme::NativeTheme(bool should_use_dark_colors,
|
||||||
|
@ -26,7 +26,7 @@ index 972b8416c2d6d6bc412567675ba8bb61ba7bec70..a102e864239ab8ac67814c38cedf2e74
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
|
diff --git a/ui/native_theme/native_theme.h b/ui/native_theme/native_theme.h
|
||||||
index 054fc3f605fd4656023125592d04c489be568ee4..fcc180ef6d3683aed291d2ebf17bbc45c1773942 100644
|
index f95db55b9899b7314792c99fad87e29530715d11..16f7d5c92e4380c7a705eaa6dc7bc11349d7f7f2 100644
|
||||||
--- a/ui/native_theme/native_theme.h
|
--- a/ui/native_theme/native_theme.h
|
||||||
+++ b/ui/native_theme/native_theme.h
|
+++ b/ui/native_theme/native_theme.h
|
||||||
@@ -410,6 +410,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
@@ -410,6 +410,23 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
||||||
|
@ -53,7 +53,7 @@ index 054fc3f605fd4656023125592d04c489be568ee4..fcc180ef6d3683aed291d2ebf17bbc45
|
||||||
// Returns a shared instance of the native theme that should be used for web
|
// Returns a shared instance of the native theme that should be used for web
|
||||||
// rendering. Do not use it in a normal application context (i.e. browser).
|
// rendering. Do not use it in a normal application context (i.e. browser).
|
||||||
// The returned object should not be deleted by the caller. This function is
|
// The returned object should not be deleted by the caller. This function is
|
||||||
@@ -592,6 +609,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
@@ -605,6 +622,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
|
||||||
PageColors page_colors_ = PageColors::kOff;
|
PageColors page_colors_ = PageColors::kOff;
|
||||||
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
|
PreferredColorScheme preferred_color_scheme_ = PreferredColorScheme::kLight;
|
||||||
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
|
PreferredContrast preferred_contrast_ = PreferredContrast::kNoPreference;
|
||||||
|
|
|
@ -90,7 +90,7 @@ index be8d6d82f56fb2841b5e2a084c8320531db16a66..3c10936738c5f487b5a40690fc34e273
|
||||||
// a cookie. If this is set to non-null, the observer passed to
|
// a cookie. If this is set to non-null, the observer passed to
|
||||||
// URLLoaderFactory will be ignored.
|
// URLLoaderFactory will be ignored.
|
||||||
diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
|
diff --git a/services/network/public/mojom/url_response_head.mojom b/services/network/public/mojom/url_response_head.mojom
|
||||||
index beab4deddd7681801025992a90f4ee54b7f18076..22f03b5afcd26bd876774a8a9728c430bbe3fe42 100644
|
index f232e84621137b4deb4846628e932508d6cf0d1e..415181034418faa4d718fb8748971b4e9cdc9bcf 100644
|
||||||
--- a/services/network/public/mojom/url_response_head.mojom
|
--- a/services/network/public/mojom/url_response_head.mojom
|
||||||
+++ b/services/network/public/mojom/url_response_head.mojom
|
+++ b/services/network/public/mojom/url_response_head.mojom
|
||||||
@@ -12,6 +12,7 @@ import "services/network/public/mojom/encoded_body_length.mojom";
|
@@ -12,6 +12,7 @@ import "services/network/public/mojom/encoded_body_length.mojom";
|
||||||
|
@ -112,7 +112,7 @@ index beab4deddd7681801025992a90f4ee54b7f18076..22f03b5afcd26bd876774a8a9728c430
|
||||||
string mime_type;
|
string mime_type;
|
||||||
|
|
||||||
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
|
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
|
||||||
index bd09094f349a1051d328c917c29cf4c3a2b9ccdb..42abf94829bb6fc9774c6225c93a77d7366cfba5 100644
|
index f2fa6521ac3f2a413c7db2cdad6b5a976e9d6133..04ef118f9b3930935a92c23c0bdfb0d015ee8434 100644
|
||||||
--- a/services/network/url_loader.cc
|
--- a/services/network/url_loader.cc
|
||||||
+++ b/services/network/url_loader.cc
|
+++ b/services/network/url_loader.cc
|
||||||
@@ -642,6 +642,7 @@ URLLoader::URLLoader(
|
@@ -642,6 +642,7 @@ URLLoader::URLLoader(
|
||||||
|
@ -122,8 +122,8 @@ index bd09094f349a1051d328c917c29cf4c3a2b9ccdb..42abf94829bb6fc9774c6225c93a77d7
|
||||||
+ report_raw_headers_ = request.trusted_params->report_raw_headers;
|
+ report_raw_headers_ = request.trusted_params->report_raw_headers;
|
||||||
}
|
}
|
||||||
|
|
||||||
throttling_token_ = network::ScopedThrottlingToken::MaybeCreate(
|
// Store any cookies passed from the browser process to later attach them to
|
||||||
@@ -708,7 +709,7 @@ URLLoader::URLLoader(
|
@@ -715,7 +716,7 @@ URLLoader::URLLoader(
|
||||||
url_request_->SetRequestHeadersCallback(base::BindRepeating(
|
url_request_->SetRequestHeadersCallback(base::BindRepeating(
|
||||||
&URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
|
&URLLoader::SetRawRequestHeadersAndNotify, base::Unretained(this)));
|
||||||
|
|
||||||
|
|
|
@ -17,10 +17,10 @@ policy->CanCommitOriginAndUrl.
|
||||||
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||||
index 6ed6d986d0d72603451fef8e6723228cdac63b3b..aabec0138adfca2d2e4a46ed525ae726e840f1c5 100644
|
index abdb8e291a7f321404aa70881af2fa60d2ef4db7..8bbc051f468bee65b292c9b75c52cc4f01e02db6 100644
|
||||||
--- a/content/browser/renderer_host/navigation_request.cc
|
--- a/content/browser/renderer_host/navigation_request.cc
|
||||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -7386,10 +7386,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
@@ -7392,10 +7392,11 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
|
||||||
if (IsForMhtmlSubframe())
|
if (IsForMhtmlSubframe())
|
||||||
return origin_with_debug_info;
|
return origin_with_debug_info;
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ index 6ed6d986d0d72603451fef8e6723228cdac63b3b..aabec0138adfca2d2e4a46ed525ae726
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
index 4653e7c5f4ac98bebdcb0de7d05f4a07154f2d36..7f0f920b8beca04bfbeb0025fc3cb69079872d63 100644
|
index 40c8eeb812338b3dc9f4f59d7672a9c4340f4305..e56bc9d06b9bef150b8de0dd66bbcc2901d6da2f 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.h
|
--- a/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.h
|
+++ b/content/browser/renderer_host/render_frame_host_impl.h
|
||||||
@@ -2893,6 +2893,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
@@ -2904,6 +2904,17 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||||
// last committed document.
|
// last committed document.
|
||||||
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
|
CookieChangeListener::CookieChangeInfo GetCookieChangeInfo();
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ index 4653e7c5f4ac98bebdcb0de7d05f4a07154f2d36..7f0f920b8beca04bfbeb0025fc3cb690
|
||||||
// Sets a ResourceCache in the renderer. `this` must be active and there must
|
// Sets a ResourceCache in the renderer. `this` must be active and there must
|
||||||
// be no pending navigation. `remote` must have the same and process
|
// be no pending navigation. `remote` must have the same and process
|
||||||
// isolation policy.
|
// isolation policy.
|
||||||
@@ -3235,17 +3246,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
@@ -3246,17 +3257,6 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
||||||
// relevant.
|
// relevant.
|
||||||
void ResetWaitingState();
|
void ResetWaitingState();
|
||||||
|
|
||||||
|
|
|
@ -64,10 +64,10 @@ index 4cd668a127a50e5462e3878c3f1dcb7384926768..dfbec49249404df8f8ebdbd26e6e865c
|
||||||
|
|
||||||
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index b1bb027294305c7cc10018d12ace9df80dca1698..786f45837ca5ad8416af52d160a726148a2fc43b 100644
|
index 780e573751d6b7cee1ff751746f57f039649e96b..48090768a67cd9b5e98d2805e46c64b043e09d2c 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -2692,6 +2692,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -2693,6 +2693,7 @@ void LocalFrame::RequestExecuteScript(
|
||||||
mojom::blink::EvaluationTiming evaluation_timing,
|
mojom::blink::EvaluationTiming evaluation_timing,
|
||||||
mojom::blink::LoadEventBlockingOption blocking_option,
|
mojom::blink::LoadEventBlockingOption blocking_option,
|
||||||
WebScriptExecutionCallback callback,
|
WebScriptExecutionCallback callback,
|
||||||
|
@ -75,7 +75,7 @@ index b1bb027294305c7cc10018d12ace9df80dca1698..786f45837ca5ad8416af52d160a72614
|
||||||
BackForwardCacheAware back_forward_cache_aware,
|
BackForwardCacheAware back_forward_cache_aware,
|
||||||
mojom::blink::WantResultOption want_result_option,
|
mojom::blink::WantResultOption want_result_option,
|
||||||
mojom::blink::PromiseResultOption promise_behavior) {
|
mojom::blink::PromiseResultOption promise_behavior) {
|
||||||
@@ -2722,7 +2723,8 @@ void LocalFrame::RequestExecuteScript(
|
@@ -2723,7 +2724,8 @@ void LocalFrame::RequestExecuteScript(
|
||||||
PausableScriptExecutor::CreateAndRun(
|
PausableScriptExecutor::CreateAndRun(
|
||||||
ToScriptState(DomWindow(), *world), std::move(script_sources),
|
ToScriptState(DomWindow(), *world), std::move(script_sources),
|
||||||
execute_script_policy, user_gesture, evaluation_timing, blocking_option,
|
execute_script_policy, user_gesture, evaluation_timing, blocking_option,
|
||||||
|
@ -86,7 +86,7 @@ index b1bb027294305c7cc10018d12ace9df80dca1698..786f45837ca5ad8416af52d160a72614
|
||||||
|
|
||||||
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
index 5a127bb9126a9f8cd05439c7fb81afe3e1fa826c..57e32dd1ad67aadbaf1b06c5555388d20eda8304 100644
|
index 2bc46fe0b173f35384888dfe0c382425ed55946e..f8fc6b4044a7ae3d345dc26af04146b3d2ae61a6 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
@@ -781,6 +781,7 @@ class CORE_EXPORT LocalFrame final
|
@@ -781,6 +781,7 @@ class CORE_EXPORT LocalFrame final
|
||||||
|
|
|
@ -20,10 +20,10 @@ index b51154ddd3d3bd49327e83adedc8bce8c64fcbcf..64db37078f898d6c8345be69d8fa03b6
|
||||||
}
|
}
|
||||||
|
|
||||||
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 b0534cbc6754f313b798436b39146da59d3fb32c..9adb63bec130fb279889eff5b5a1cf952cd97d28 100644
|
index d89b97d141c66696caa5535b03f4da994fd28210..0f67c7b6517b1153f01a3318ebde0c37ecf1264e 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
|
||||||
@@ -276,6 +276,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
@@ -277,6 +277,11 @@ class CONTENT_EXPORT ContentBrowserClient {
|
||||||
|
|
||||||
virtual ~ContentBrowserClient() = default;
|
virtual ~ContentBrowserClient() = default;
|
||||||
|
|
||||||
|
|
|
@ -38,10 +38,10 @@ index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb2497
|
||||||
// Returns whether `Initialize` has already been invoked in the process.
|
// Returns whether `Initialize` has already been invoked in the process.
|
||||||
// Initialization is a one-way operation (i.e., this method cannot return
|
// Initialization is a one-way operation (i.e., this method cannot return
|
||||||
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
|
||||||
index 213ae405fe5a0da600121b9c8868549402be55de..ae8116dae33d0e7340e526263de86a4b181f1a19 100644
|
index 1b7843b95921732bc68ac2a29082fafe1e27a2ab..f65c0fd59dfe3029fe47d3401759298e75243839 100644
|
||||||
--- a/gin/v8_initializer.cc
|
--- a/gin/v8_initializer.cc
|
||||||
+++ b/gin/v8_initializer.cc
|
+++ b/gin/v8_initializer.cc
|
||||||
@@ -391,7 +391,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
@@ -394,7 +394,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
|
||||||
// static
|
// static
|
||||||
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
||||||
const std::string js_command_line_flags,
|
const std::string js_command_line_flags,
|
||||||
|
@ -51,7 +51,7 @@ index 213ae405fe5a0da600121b9c8868549402be55de..ae8116dae33d0e7340e526263de86a4b
|
||||||
static bool v8_is_initialized = false;
|
static bool v8_is_initialized = false;
|
||||||
if (v8_is_initialized)
|
if (v8_is_initialized)
|
||||||
return;
|
return;
|
||||||
@@ -401,7 +402,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
@@ -404,7 +405,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
|
||||||
// See https://crbug.com/v8/11043
|
// See https://crbug.com/v8/11043
|
||||||
SetFlags(mode, js_command_line_flags);
|
SetFlags(mode, js_command_line_flags);
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
|
||||||
Add electron resources file to the list of resource ids generation.
|
Add electron resources file to the list of resource ids generation.
|
||||||
|
|
||||||
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
|
||||||
index affd24402ac6dd10c27848805acc192df2838f20..568e5644c7afc8e9544d615e8e016a3e16fbff0b 100644
|
index 81fff672fa54c240ab86f73f95a3441fe78316b5..2906e29139c721a84ec44aeb4d62f87ba5977569 100644
|
||||||
--- a/tools/gritsettings/resource_ids.spec
|
--- a/tools/gritsettings/resource_ids.spec
|
||||||
+++ b/tools/gritsettings/resource_ids.spec
|
+++ b/tools/gritsettings/resource_ids.spec
|
||||||
@@ -1115,6 +1115,11 @@
|
@@ -1123,6 +1123,11 @@
|
||||||
"includes": [4960],
|
"includes": [4960],
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ If removing this patch causes no sync failures, it's safe to delete :+1:
|
||||||
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
|
Ref https://chromium-review.googlesource.com/c/chromium/src/+/2953903
|
||||||
|
|
||||||
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
|
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
|
||||||
index 98563fdfbcc28e5e19f644415253cfb8ea3560ad..c41fbf933c9ac839507f0f2c32a0feda29487946 100755
|
index c86343459e853689d9cfb8729525a8aed4c73e2c..d04f37058b573b609eec94d384f5d088558ca7c4 100755
|
||||||
--- a/tools/clang/scripts/update.py
|
--- a/tools/clang/scripts/update.py
|
||||||
+++ b/tools/clang/scripts/update.py
|
+++ b/tools/clang/scripts/update.py
|
||||||
@@ -305,6 +305,8 @@ def GetDefaultHostOs():
|
@@ -305,6 +305,8 @@ def GetDefaultHostOs():
|
||||||
|
|
|
@ -44,7 +44,7 @@ index 3600a7ce7b3e6540767f64c631f352aa62240459..3147961f3d1c2c1690b5adf16a9a58f7
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
||||||
index d66dc7edd743aea6e72961ce28da6aab6f6c3c95..c33a86b8cd3e7162b61f7eaf47e7326e1cc7dd61 100644
|
index 4befb8cc94966c4c6ea21dd2d4f9c40152486387..5f17cc7422f5627d20186fe674cc2c6bcb1decaa 100644
|
||||||
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
||||||
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
|
||||||
@@ -572,10 +572,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
|
@@ -572,10 +572,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {
|
||||||
|
|
|
@ -9,10 +9,10 @@ system font by checking if it's kCTFontPriorityAttribute is set to
|
||||||
system priority.
|
system priority.
|
||||||
|
|
||||||
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
|
diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
|
||||||
index 8e5959d2197b16392890cc2675cea0b616b348e5..62ccb85f3c1fec1d2c32f78ee57694f5df3ef494 100644
|
index 1c563484862eedcd260db03036769778c6a48991..cd47d4c83bd99587c3e5b77941c4b4bbb01280b8 100644
|
||||||
--- a/ui/gfx/platform_font_mac.mm
|
--- a/ui/gfx/platform_font_mac.mm
|
||||||
+++ b/ui/gfx/platform_font_mac.mm
|
+++ b/ui/gfx/platform_font_mac.mm
|
||||||
@@ -25,9 +25,11 @@
|
@@ -27,9 +27,11 @@
|
||||||
|
|
||||||
using Weight = Font::Weight;
|
using Weight = Font::Weight;
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ index 8e5959d2197b16392890cc2675cea0b616b348e5..62ccb85f3c1fec1d2c32f78ee57694f5
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
@@ -228,7 +230,13 @@ NSInteger ToNSFontManagerWeight(Weight weight) {
|
@@ -243,7 +245,13 @@ CTFontRef SystemFontForConstructorOfType(PlatformFontMac::SystemFontType type) {
|
||||||
// TODO(avi, etienneb): Figure out this font stuff.
|
// TODO(avi, etienneb): Figure out this font stuff.
|
||||||
base::ScopedCFTypeRef<CTFontDescriptorRef> descriptor(
|
base::ScopedCFTypeRef<CTFontDescriptorRef> descriptor(
|
||||||
CTFontCopyFontDescriptor(font));
|
CTFontCopyFontDescriptor(font));
|
||||||
|
|
|
@ -177,7 +177,7 @@ index 34b92d40efedb02efd42a8805c7630efd1fd2005..574434c94e0ee145c9a86566baa04d1c
|
||||||
std::unique_ptr<HostResolver> internal_host_resolver_;
|
std::unique_ptr<HostResolver> internal_host_resolver_;
|
||||||
// Map values set to non-null only if that HostResolver has its own private
|
// Map values set to non-null only if that HostResolver has its own private
|
||||||
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
||||||
index 915aa8eacd9e9ed1f76418284f272fbdf94dce9d..3b9d7b94d93b7d9f8f5ae54c76fd533d151d54c3 100644
|
index 67ec13248477a6897cca614f235f813587e73eb1..8d8899d941050868c80642d6589e4e3bc48462c7 100644
|
||||||
--- a/services/network/public/mojom/network_context.mojom
|
--- a/services/network/public/mojom/network_context.mojom
|
||||||
+++ b/services/network/public/mojom/network_context.mojom
|
+++ b/services/network/public/mojom/network_context.mojom
|
||||||
@@ -297,6 +297,17 @@ struct NetworkContextFilePaths {
|
@@ -297,6 +297,17 @@ struct NetworkContextFilePaths {
|
||||||
|
|
|
@ -176,10 +176,10 @@ index d9e36712dc3fbc6a9043e2c33660090ca2f7367b..7d910583eb22fc315eb0619febe518d5
|
||||||
const GURL& origin,
|
const GURL& origin,
|
||||||
const GURL& document_url,
|
const GURL& document_url,
|
||||||
diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc
|
diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc
|
||||||
index b3ef5af4450b3f96787bc3f9935dfdf19ebaaa94..6a4309070e0f6eaa743deefb0aeb2d0be558a787 100644
|
index 56b56dff38b6f0e6a2967e10462667e0a8ead6ce..85a1894767df7026388e0486f96d9ddb602391e4 100644
|
||||||
--- a/content/test/mock_platform_notification_service.cc
|
--- a/content/test/mock_platform_notification_service.cc
|
||||||
+++ b/content/test/mock_platform_notification_service.cc
|
+++ b/content/test/mock_platform_notification_service.cc
|
||||||
@@ -29,6 +29,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(
|
@@ -28,6 +28,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(
|
||||||
MockPlatformNotificationService::~MockPlatformNotificationService() = default;
|
MockPlatformNotificationService::~MockPlatformNotificationService() = default;
|
||||||
|
|
||||||
void MockPlatformNotificationService::DisplayNotification(
|
void MockPlatformNotificationService::DisplayNotification(
|
||||||
|
|
|
@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them. This patch can be
|
||||||
our autofill implementation to work like Chromium's.
|
our autofill implementation to work like Chromium's.
|
||||||
|
|
||||||
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
|
diff --git a/ui/color/color_id.h b/ui/color/color_id.h
|
||||||
index 015a88ea44e7eb60c89680e032f43b5e16d6daa1..9302b3f44e0797e3453e27ae204924cf2fa3b2b0 100644
|
index 1539abfba5e5a65b2ed1a49d707b120048ca3c06..e8f9fcf4fb50f76e9795cc1f7f645528bf4eee17 100644
|
||||||
--- a/ui/color/color_id.h
|
--- a/ui/color/color_id.h
|
||||||
+++ b/ui/color/color_id.h
|
+++ b/ui/color/color_id.h
|
||||||
@@ -355,6 +355,10 @@
|
@@ -355,6 +355,10 @@
|
||||||
|
@ -61,10 +61,10 @@ index e52dd23cef1ea6cc2b61f51650b94de382683cc0..8b103d7d5a6ed860cb76d3ca7e23bb2e
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/ui/color/win/native_color_mixers_win.cc b/ui/color/win/native_color_mixers_win.cc
|
diff --git a/ui/color/win/native_color_mixers_win.cc b/ui/color/win/native_color_mixers_win.cc
|
||||||
index 4579b16add6c509a2a8f9c61a07a79b891496f29..7790255f0e9295e30a1ba3060fafdb2d57990dae 100644
|
index 1a26abccb3008e78881d2ddfadba904d5c9b422e..b9ff42c4a65972ad937bb379ad5318bd15e5a22a 100644
|
||||||
--- a/ui/color/win/native_color_mixers_win.cc
|
--- a/ui/color/win/native_color_mixers_win.cc
|
||||||
+++ b/ui/color/win/native_color_mixers_win.cc
|
+++ b/ui/color/win/native_color_mixers_win.cc
|
||||||
@@ -162,6 +162,10 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
@@ -203,6 +203,10 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
||||||
SetAlpha(kColorNotificationInputForeground, gfx::kGoogleGreyAlpha700);
|
SetAlpha(kColorNotificationInputForeground, gfx::kGoogleGreyAlpha700);
|
||||||
mixer[kColorSliderTrack] = AlphaBlend(
|
mixer[kColorSliderTrack] = AlphaBlend(
|
||||||
kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
|
kColorNativeHighlight, kColorNativeWindow, gfx::kGoogleGreyAlpha400);
|
||||||
|
@ -75,13 +75,15 @@ index 4579b16add6c509a2a8f9c61a07a79b891496f29..7790255f0e9295e30a1ba3060fafdb2d
|
||||||
|
|
||||||
// Window Background
|
// Window Background
|
||||||
mixer[kColorBubbleFooterBackground] = {kColorNativeWindow};
|
mixer[kColorBubbleFooterBackground] = {kColorNativeWindow};
|
||||||
@@ -169,11 +173,13 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
@@ -211,6 +215,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
||||||
mixer[kColorFrameActive] = {ui::kColorNativeWindow};
|
|
||||||
mixer[kColorFrameInactive] = {ui::kColorNativeWindow};
|
mixer[kColorFrameInactive] = {ui::kColorNativeWindow};
|
||||||
|
mixer[kColorPrimaryBackground] = {kColorNativeWindow};
|
||||||
mixer[kColorTooltipBackground] = {kColorNativeWindow};
|
mixer[kColorTooltipBackground] = {kColorNativeWindow};
|
||||||
+ mixer[kColorResultsTableNormalBackground] = {kColorNativeWindow};
|
+ mixer[kColorResultsTableNormalBackground] = {kColorNativeWindow};
|
||||||
|
|
||||||
// Window Text
|
// Window Text
|
||||||
|
mixer[kColorAlertLowSeverity] = {kColorNativeWindowText};
|
||||||
|
@@ -224,6 +229,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
||||||
mixer[kColorTableGroupingIndicator] = {kColorNativeWindowText};
|
mixer[kColorTableGroupingIndicator] = {kColorNativeWindowText};
|
||||||
mixer[kColorThrobber] = {kColorNativeWindowText};
|
mixer[kColorThrobber] = {kColorNativeWindowText};
|
||||||
mixer[kColorTooltipForeground] = {kColorNativeWindowText};
|
mixer[kColorTooltipForeground] = {kColorNativeWindowText};
|
||||||
|
@ -89,11 +91,11 @@ index 4579b16add6c509a2a8f9c61a07a79b891496f29..7790255f0e9295e30a1ba3060fafdb2d
|
||||||
|
|
||||||
// Hyperlinks
|
// Hyperlinks
|
||||||
mixer[kColorLinkForeground] = {kColorNativeHotlight};
|
mixer[kColorLinkForeground] = {kColorNativeHotlight};
|
||||||
@@ -207,6 +213,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
@@ -266,6 +272,7 @@ void AddNativeUiColorMixer(ColorProvider* provider,
|
||||||
mixer[kColorTextfieldForeground] = {kColorNativeBtnText};
|
mixer[kColorTextfieldForeground] = {kColorNativeBtnText};
|
||||||
mixer[kColorTextfieldForegroundPlaceholder] = {kColorNativeBtnText};
|
mixer[kColorTextfieldForegroundPlaceholder] = {kColorNativeBtnText};
|
||||||
mixer[kColorTextfieldForegroundDisabled] = {kColorNativeBtnText};
|
mixer[kColorTextfieldForegroundDisabled] = {kColorNativeBtnText};
|
||||||
+ mixer[kColorUnfocusedBorder] = {kColorNativeBtnText};
|
+ mixer[kColorUnfocusedBorder] = {kColorNativeBtnText};
|
||||||
|
|
||||||
// Highlight/Selected Background
|
// Highlight/Selected Background
|
||||||
mixer[kColorButtonBorder] = {kColorNativeHighlight};
|
mixer[kColorAccent] = {kColorNativeHighlight};
|
||||||
|
|
|
@ -831,10 +831,10 @@ index 146fbcb2e6bd4348110ecc3220d6ac0ac59babf3..eecc3118033ef7fe1f17aba48cd19b17
|
||||||
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
#if BUILDFLAG(ENABLE_PRINT_PREVIEW)
|
||||||
// Set options for print preset from source PDF document.
|
// Set options for print preset from source PDF document.
|
||||||
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 64545f656ebaea21acfb98f21d4988296dc19334..7274b2166905e5d61de8daef5ff2e71effd427a1 100644
|
index aaf5673f33e3cfbdce1dd72beb362180f2e7896a..fce93ca350d0fa6235f740a8c8ca67b2943a1a30 100644
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -2856,8 +2856,9 @@ source_set("browser") {
|
@@ -2858,8 +2858,9 @@ source_set("browser") {
|
||||||
"//ppapi/shared_impl",
|
"//ppapi/shared_impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ 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 df28eb7e3b2f4c7030ef5363dd68c1c2c7db2cac..a2f4a9ec96f9212b521fddacf59057c121192b66 100644
|
index 2937f35372bafd9158be712f04d2731bb4100f9a..9c3b945f91f083bfdf32ec90bea3ed73220e4414 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
|
||||||
@@ -6933,6 +6933,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -6933,6 +6933,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
|
|
|
@ -26,10 +26,10 @@ index 77f2c4fbf8c886c5c622f41d0b9da67d09b7d331..7aa2059f33dfa92828beec95f4716775
|
||||||
// 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 decef7b3d86c0538bc1bede5c761438ade86e0d4..df22e32a5a9bed8457f8db9dbe2f8cd093a4c06e 100644
|
index acc5e11a24248ef37db4e20a74f3469ab33ed12b..3f582acf43ffd21f0f5eb485bf4d6a5cca8d2250 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
|
||||||
@@ -824,6 +824,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
@@ -826,6 +826,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
||||||
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,10 +43,10 @@ index decef7b3d86c0538bc1bede5c761438ade86e0d4..df22e32a5a9bed8457f8db9dbe2f8cd0
|
||||||
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 a15ca0214e694e9eda2ef88c0100ba26f306d9dc..0bf1ebaafaf8147350aa0d5daccd2eabe7bb0ab9 100644
|
index 594e30a46018dc47d8c6bfd4de2160d874e7e176..6028e84c41e6f4f5e4c3194388c6ecda9e4fa770 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
|
||||||
@@ -180,6 +180,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -175,6 +175,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;
|
||||||
|
|
|
@ -35,10 +35,10 @@ index 7aa2059f33dfa92828beec95f4716775e7291fed..df919b894d4f29274696806444d034d4
|
||||||
// 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 df22e32a5a9bed8457f8db9dbe2f8cd093a4c06e..538e7be679804c536ff4c124926345487437d150 100644
|
index 3f582acf43ffd21f0f5eb485bf4d6a5cca8d2250..b98eb4fad9b9585e8a32734d23030983037d4e59 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
|
||||||
@@ -836,6 +836,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
@@ -838,6 +838,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
||||||
worker);
|
worker);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,10 +52,10 @@ index df22e32a5a9bed8457f8db9dbe2f8cd093a4c06e..538e7be679804c536ff4c12492634548
|
||||||
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 0bf1ebaafaf8147350aa0d5daccd2eabe7bb0ab9..57ad67acccbe08fe3a551026fcf512db79353567 100644
|
index 6028e84c41e6f4f5e4c3194388c6ecda9e4fa770..cb6333c731b3c36a46a577665ca75ca75299ae3f 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
|
||||||
@@ -180,6 +180,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
@@ -175,6 +175,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;
|
||||||
|
|
|
@ -9,7 +9,7 @@ necessary for native modules to load.
|
||||||
Also, some fixes relating to mksnapshot on ARM.
|
Also, some fixes relating to mksnapshot on ARM.
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index 07db0102bc8ae92ac8286a7e1d98bbecf90a4405..78ef04bb3a72d6ce689f42bd76adfea9b8a3ddc2 100644
|
index bca193c467c25f57a2be33c96366e516d3616994..942e78e6537b8fe55545cf7a91038dc119a0c8f7 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -709,7 +709,7 @@ config("internal_config") {
|
@@ -709,7 +709,7 @@ config("internal_config") {
|
||||||
|
@ -21,7 +21,7 @@ index 07db0102bc8ae92ac8286a7e1d98bbecf90a4405..78ef04bb3a72d6ce689f42bd76adfea9
|
||||||
defines += [ "BUILDING_V8_SHARED" ]
|
defines += [ "BUILDING_V8_SHARED" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6426,7 +6426,7 @@ if (current_toolchain == v8_generator_toolchain) {
|
@@ -6437,7 +6437,7 @@ if (current_toolchain == v8_generator_toolchain) {
|
||||||
"src/interpreter/bytecodes.h",
|
"src/interpreter/bytecodes.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ Subject: dcheck.patch
|
||||||
https://github.com/auchenberg/volkswagen
|
https://github.com/auchenberg/volkswagen
|
||||||
|
|
||||||
diff --git a/src/api/api.cc b/src/api/api.cc
|
diff --git a/src/api/api.cc b/src/api/api.cc
|
||||||
index 14b92dbaf09ad904114db4351bf9323cbab28105..94695707c0caa53ce382e3d517c383716c757a39 100644
|
index 3f6fe87d632f9285c37bcd4d8d4298a81cee85b6..fd22728908b3a09c9d372fef102942dec7aaa75a 100644
|
||||||
--- a/src/api/api.cc
|
--- a/src/api/api.cc
|
||||||
+++ b/src/api/api.cc
|
+++ b/src/api/api.cc
|
||||||
@@ -9896,7 +9896,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
|
@@ -9896,7 +9896,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
|
||||||
|
|
|
@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
|
||||||
contain any standard C++ library exports (e.g. `std::ostringstream`).
|
contain any standard C++ library exports (e.g. `std::ostringstream`).
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index 59f33f74464a14cf7606a4232c058f9ef8d406cc..b4109e8a55288db82407e2f9cde59143aed9023f 100644
|
index eb4beeceef43fafd5362b3abd42a0a79327348e3..77db34b81027dd765245e9e720159d9b41e3739a 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -709,6 +709,10 @@ config("internal_config") {
|
@@ -709,6 +709,10 @@ config("internal_config") {
|
||||||
|
@ -27,10 +27,10 @@ index 59f33f74464a14cf7606a4232c058f9ef8d406cc..b4109e8a55288db82407e2f9cde59143
|
||||||
defines += [ "BUILDING_V8_SHARED" ]
|
defines += [ "BUILDING_V8_SHARED" ]
|
||||||
}
|
}
|
||||||
diff --git a/src/base/macros.h b/src/base/macros.h
|
diff --git a/src/base/macros.h b/src/base/macros.h
|
||||||
index cd5b91f745a4532b6248d5504fd100cd9806fee4..00321c74d8b195b7024cfa778aa685410edd8dc0 100644
|
index afdf30815e19c909649938f3b43b6fa9617dacf0..138dd0a3adbd7bc4a58083663871eca6d1a29b54 100644
|
||||||
--- a/src/base/macros.h
|
--- a/src/base/macros.h
|
||||||
+++ b/src/base/macros.h
|
+++ b/src/base/macros.h
|
||||||
@@ -388,13 +388,17 @@ bool is_inbounds(float_t v) {
|
@@ -383,13 +383,17 @@ bool is_inbounds(float_t v) {
|
||||||
#ifdef V8_OS_WIN
|
#ifdef V8_OS_WIN
|
||||||
|
|
||||||
// Setup for Windows shared library export.
|
// Setup for Windows shared library export.
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
|
||||||
Needed in order to target mksnapshot for mksnapshot zip.
|
Needed in order to target mksnapshot for mksnapshot zip.
|
||||||
|
|
||||||
diff --git a/BUILD.gn b/BUILD.gn
|
diff --git a/BUILD.gn b/BUILD.gn
|
||||||
index 78ef04bb3a72d6ce689f42bd76adfea9b8a3ddc2..59f33f74464a14cf7606a4232c058f9ef8d406cc 100644
|
index 942e78e6537b8fe55545cf7a91038dc119a0c8f7..eb4beeceef43fafd5362b3abd42a0a79327348e3 100644
|
||||||
--- a/BUILD.gn
|
--- a/BUILD.gn
|
||||||
+++ b/BUILD.gn
|
+++ b/BUILD.gn
|
||||||
@@ -6438,7 +6438,6 @@ if (current_toolchain == v8_generator_toolchain) {
|
@@ -6449,7 +6449,6 @@ if (current_toolchain == v8_generator_toolchain) {
|
||||||
|
|
||||||
if (current_toolchain == v8_snapshot_toolchain) {
|
if (current_toolchain == v8_snapshot_toolchain) {
|
||||||
v8_executable("mksnapshot") {
|
v8_executable("mksnapshot") {
|
||||||
|
|
Loading…
Reference in a new issue