chore: bump chromium to f156cb7658ec5382f5623a05841c6 (master) (#19096)
* chore: bump chromium in DEPS to 37cd06a295cf156cb7658ec5382f5623a05841c6
* update patches
* fix: replace NO_TRAFFIC_ANNOTATION_YET with MISSING_TRAFFIC_ANNOTATION
Refs: 1653256
This commit is contained in:
parent
ae01a48fca
commit
d362be5cd9
24 changed files with 59 additions and 76 deletions
|
@ -14,10 +14,10 @@ when there is code doing that.
|
|||
This patch reverts the change to fix the crash in Electron.
|
||||
|
||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
index 2bf09644bdd6bf6f8dd49557f9e707f7bf77c2b4..bc36e8bc9fc1a973c89d52e60bd62e753ef17f15 100644
|
||||
index b4e75c8bc63c30c4d0dde96912aee87260662103..3a61f37a05fb5e626a0898b53600b79ab3c20f88 100644
|
||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -331,10 +331,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
@@ -332,10 +332,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
}
|
||||
CHECK(!view_ || !view_->IsAttached());
|
||||
|
||||
|
@ -28,7 +28,7 @@ index 2bf09644bdd6bf6f8dd49557f9e707f7bf77c2b4..bc36e8bc9fc1a973c89d52e60bd62e75
|
|||
if (!Client())
|
||||
return;
|
||||
|
||||
@@ -352,6 +348,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
@@ -353,6 +349,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
// Notify ScriptController that the frame is closing, since its cleanup ends
|
||||
// up calling back to LocalFrameClient via WindowProxy.
|
||||
GetScriptController().ClearForClose();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue