Commit b5349fb4 authored by Xiao Yang's avatar Xiao Yang Committed by Commit Bot

Fixed crash in RenderViewContextMenuViews::Show on Windows

1. Added null check for submenu Host in RenderViewContextMenuViews::
Show() to avoid crash.

Bug: 1054962
Change-Id: Iff52355a89c64038dd3f7828a638b804563d4ae2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070960Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarRobert Liao <robliao@chromium.org>
Commit-Queue: Xiao Yang <yanxiao@google.com>
Cr-Commit-Position: refs/heads/master@{#744794}
parent ddfa8eb2
...@@ -303,12 +303,14 @@ void RenderViewContextMenuViews::Show() { ...@@ -303,12 +303,14 @@ void RenderViewContextMenuViews::Show() {
RunMenuAt(top_level_widget, screen_point, params().source_type); RunMenuAt(top_level_widget, screen_point, params().source_type);
for (auto& observer : observers_) { for (auto& observer : observers_) {
observer.OnContextMenuShown( auto* submenu_host = static_cast<ToolkitDelegateViews*>(toolkit_delegate())
params_, static_cast<ToolkitDelegateViews*>(toolkit_delegate()) ->menu_view()
->menu_view() ->GetSubmenu()
->GetSubmenu() ->host();
->host() if (submenu_host) {
->GetWindowBoundsInScreen()); observer.OnContextMenuShown(params_,
submenu_host->GetWindowBoundsInScreen());
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment