Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(762)

Unified Diff: content/browser/frame_host/render_widget_host_view_child_frame.cc

Issue 2054163003: Fix SitePerProcessTextInputManagerTest.StopTrackingCrashedChildFrame on CFI Bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased + Remove internal observers from TextInputManager's observer list Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 91d0b2ae5c4dda616a28e30621f921a5e67221dd..52644448342d262b3ed7c350fa4139b67c4e549d 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -28,6 +28,7 @@
#include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_input_event_router.h"
+#include "content/browser/renderer_host/text_input_manager.h"
#include "content/common/text_input_state.h"
#include "content/common/view_messages.h"
#include "content/public/browser/render_process_host.h"
@@ -287,6 +288,10 @@ void RenderWidgetHostViewChildFrame::Destroy() {
host_->SetView(nullptr);
host_ = nullptr;
+
+ if (text_input_manager_)
+ text_input_manager_->Unregister(this);
Charlie Reis 2016/06/28 18:12:41 I thought RWHVBase took care of this. Won't this
EhsanK 2016/06/28 18:56:54 When we unregister, TextInputManager calls the met
kenrb 2016/06/28 19:34:40 It isn't necessary, as I understand it, because yo
+
base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
}

Powered by Google App Engine
This is Rietveld 408576698