resolve errors introduced during rebase

2017-05-02 03:57:40 +02:00 · 2017-05-02 03:57:40 +02:00 · 92cc6746b1
commit 92cc6746b1
parent aa89bc0bb8
2 changed files with 3 additions and 2 deletions
--- a/atom/browser/osr/osr_render_widget_host_view.cc
+++ b/atom/browser/osr/osr_render_widget_host_view.cc
@ -271,6 +271,7 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
      weak_ptr_factory_(this) {
  DCHECK(render_widget_host_);
 #if !defined(OS_MACOSX)
+  bool is_guest_view_hack = parent_host_view_ != nullptr;
  delegated_frame_host_ = base::MakeUnique<content::DelegatedFrameHost>(
      AllocateFrameSinkId(is_guest_view_hack), this);