Commit 16d6ce5d authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

[mac] Check if GetAssociatedFrameWidget() is valid before GetStringAtPoint()

This CL checks if GetAssociatedFrameWidget() is valid before
GetStringAtPoint() since |blink_frame_widget_| from RenderWidgetHostImpl
could be unbound at some point. So, like other methods in
RenderWidgetHostImpl, TextInputClientMac::GetStringAtPoint() also check
GetAssociatedFrameWidget() is valid.

Bug: 1136471
Change-Id: Ia5a17e9ebf14bd0e3743b6236ddde0c08f0e4969
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462921Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#816043}
parent 65450216
......@@ -65,8 +65,12 @@ void TextInputClientMac::GetStringAtPoint(RenderWidgetHost* rwh,
const gfx::Point& point,
GetStringCallback callback) {
RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(rwh);
rwhi->GetAssociatedFrameWidget()->GetStringAtPoint(point,
std::move(callback));
if (rwhi && rwhi->GetAssociatedFrameWidget()) {
rwhi->GetAssociatedFrameWidget()->GetStringAtPoint(point,
std::move(callback));
} else {
std::move(callback).Run(nullptr, gfx::Point());
}
}
void TextInputClientMac::GetStringFromRange(RenderWidgetHost* rwh,
......
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