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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2422973003: Fix TextInputClientMac related crashes of Fullscreen RenderWidget (Closed)
Patch Set: Avoid sending the IPC to Fullscreen RenderWidget Created 4 years, 1 month 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/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a24ea16d2dff31c2e46d04080e2556a8751f4228..95b60a9ddd8b6b144e3f08e9e76fa7d58b0c24ca 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -928,10 +928,9 @@ RenderWidgetHostView* WebContentsImpl::GetTopLevelRenderWidgetHostView() {
RenderWidgetHostView* WebContentsImpl::GetFullscreenRenderWidgetHostView()
const {
- RenderWidgetHost* const widget_host =
- RenderWidgetHostImpl::FromID(fullscreen_widget_process_id_,
- fullscreen_widget_routing_id_);
- return widget_host ? widget_host->GetView() : NULL;
+ if (auto widget_host = GetFullscreenRenderWidgetHost())
+ return widget_host->GetView();
+ return nullptr;
}
WebContentsView* WebContentsImpl::GetView() const {
@@ -4998,6 +4997,11 @@ int WebContentsImpl::GetOuterDelegateFrameTreeNodeId() {
return FrameTreeNode::kFrameTreeNodeInvalidId;
}
+RenderWidgetHostImpl* WebContentsImpl::GetFullscreenRenderWidgetHost() const {
+ return RenderWidgetHostImpl::FromID(fullscreen_widget_process_id_,
+ fullscreen_widget_routing_id_);
+}
+
RenderFrameHostManager* WebContentsImpl::GetRenderManager() const {
return frame_tree_.root()->render_manager();
}

Powered by Google App Engine
This is Rietveld 408576698