Commit b6695438 authored by danakj's avatar danakj Committed by Commit Bot

Remove null checks for undead widgets in MouseLockDispatcher code

RenderWidget is never entered by IPC when undead or provisional, not
by C++ outside of Close() when undead. Branches can go away.

R=avi@chromium.org

Bug: 419087
Change-Id: Iebcd2501b60d3836d66acd6d64787d41322e8641
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854522
Commit-Queue: danakj <danakj@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704947}
parent fa2b7c1c
...@@ -197,24 +197,14 @@ class WebWidgetLockTarget : public content::MouseLockDispatcher::LockTarget { ...@@ -197,24 +197,14 @@ class WebWidgetLockTarget : public content::MouseLockDispatcher::LockTarget {
: render_widget_(render_widget) {} : render_widget_(render_widget) {}
void OnLockMouseACK(bool succeeded) override { void OnLockMouseACK(bool succeeded) override {
// TODO(https://crbug.com/995981): Once RenderWidget and WebWidget lifetimes
// are synchronized, we should remove these conditionals.
WebWidget* web_widget = render_widget_->GetWebWidget();
if (!web_widget)
return;
if (succeeded) if (succeeded)
web_widget->DidAcquirePointerLock(); render_widget_->GetWebWidget()->DidAcquirePointerLock();
else else
web_widget->DidNotAcquirePointerLock(); render_widget_->GetWebWidget()->DidNotAcquirePointerLock();
} }
void OnMouseLockLost() override { void OnMouseLockLost() override {
WebWidget* web_widget = render_widget_->GetWebWidget(); render_widget_->GetWebWidget()->DidLosePointerLock();
if (!web_widget)
return;
web_widget->DidLosePointerLock();
} }
bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override { bool HandleMouseLockedInputEvent(const blink::WebMouseEvent& event) override {
...@@ -616,8 +606,7 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) { ...@@ -616,8 +606,7 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) {
if (IPC_MESSAGE_CLASS(message) == TextInputClientMsgStart) if (IPC_MESSAGE_CLASS(message) == TextInputClientMsgStart)
return text_input_client_observer_->OnMessageReceived(message); return text_input_client_observer_->OnMessageReceived(message);
#endif #endif
if (mouse_lock_dispatcher_ && if (mouse_lock_dispatcher_->OnMessageReceived(message))
mouse_lock_dispatcher_->OnMessageReceived(message))
return true; return true;
IPC_BEGIN_MESSAGE_MAP(RenderWidget, message) IPC_BEGIN_MESSAGE_MAP(RenderWidget, message)
......
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