From 92cc6746b1322e00255b881eb767c2ba729da487 Mon Sep 17 00:00:00 2001 From: Heilig Benedek Date: Tue, 2 May 2017 03:57:40 +0200 Subject: [PATCH] resolve errors introduced during rebase --- atom/browser/osr/osr_output_device.cc | 4 ++-- atom/browser/osr/osr_render_widget_host_view.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/atom/browser/osr/osr_output_device.cc b/atom/browser/osr/osr_output_device.cc index d418634272..c930cb7de9 100644 --- a/atom/browser/osr/osr_output_device.cc +++ b/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 { diff --git a/atom/browser/osr/osr_render_widget_host_view.cc b/atom/browser/osr/osr_render_widget_host_view.cc index 3d3729d1eb..f9ea13440f 100644 --- 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( AllocateFrameSinkId(is_guest_view_hack), this);