From beccb2dd1b3bf195e1de785b3efda2013597a6b8 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Wed, 25 Jan 2017 12:34:18 -0500
Subject: [PATCH] Fix potential OSR crash on renderer process recreation (issue
 #2082)

---
 libcef/browser/osr/render_widget_host_view_osr.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc
index 13eb412e3..036a5b3da 100644
--- a/libcef/browser/osr/render_widget_host_view_osr.cc
+++ b/libcef/browser/osr/render_widget_host_view_osr.cc
@@ -472,7 +472,6 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
       weak_ptr_factory_(this) {
   DCHECK(render_widget_host_);
   DCHECK(!render_widget_host_->GetView());
-  render_widget_host_->SetView(this);
 
   // CefBrowserHostImpl might not be created at this time for popups.
   if (content::RenderViewHost::From(render_widget_host_)) {
@@ -503,6 +502,9 @@ CefRenderWidgetHostViewOSR::CefRenderWidgetHostViewOSR(
 
   if (browser_impl_.get())
     ResizeRootLayer();
+
+  // Do this last because it may result in a call to SetNeedsBeginFrames.
+  render_widget_host_->SetView(this);
 }
 
 CefRenderWidgetHostViewOSR::~CefRenderWidgetHostViewOSR() {