Skip to content

Commit

Permalink
Exit early if ToScriptStateForMainWorld() is nullptr in NavigationApi…
Browse files Browse the repository at this point in the history
…::DispatchNavigateEvent

(cherry picked from commit ac216c5)

Bug: 1316437
Change-Id: Id3e2f141541cae259ce38f0836f659fdcb742973
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3587615
Reviewed-by: Domenic Denicola <domenic@chromium.org>
Commit-Queue: Domenic Denicola <domenic@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#993339}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3594452
Auto-Submit: Nate Chapin <japhet@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/5005@{#38}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}
  • Loading branch information
natechapin authored and Chromium LUCI CQ committed Apr 19, 2022
1 parent dc0d089 commit f18af38
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,8 @@ NavigationApi::DispatchResult NavigationApi::DispatchNavigateEvent(

auto* script_state =
ToScriptStateForMainWorld(GetSupplementable()->GetFrame());
if (!script_state)
return DispatchResult::kContinue;
ScriptState::Scope scope(script_state);

if (params.frame_load_type == WebFrameLoadType::kBackForward &&
Expand Down

0 comments on commit f18af38

Please sign in to comment.