resolve errors introduced during rebase

atom/browser/osr/osr_output_device.cc

@@ -4,9 +4,9 @@
 
 #include "atom/browser/osr/osr_output_device.h"
 
-#include "third_party/skia/src/core/SkColor.h"
+#include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/src/core/SkDevice.h"
-#include "third_party/skia/src/core/SkRect.h"
 #include "ui/gfx/skia_util.h"
 
 namespace atom {

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);