mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

resolve errors introduced during rebase

Browse source
This commit is contained in:
Heilig Benedek 2017-05-02 03:57:40 +02:00
parent aa89bc0bb8
commit 92cc6746b1
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/osr/osr_output_device.cc
View file

@ -4,9 +4,9 @@
#include "atom/browser/osr/osr_output_device.h" #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/SkDevice.h"
#include "third_party/skia/src/core/SkRect.h"
#include "ui/gfx/skia_util.h" #include "ui/gfx/skia_util.h"
namespace atom { namespace atom {

1
atom/browser/osr/osr_render_widget_host_view.cc
View file

@ -271,6 +271,7 @@ OffScreenRenderWidgetHostView::OffScreenRenderWidgetHostView(
weak_ptr_factory_(this) { weak_ptr_factory_(this) {
DCHECK(render_widget_host_); DCHECK(render_widget_host_);
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
bool is_guest_view_hack = parent_host_view_ != nullptr;
delegated_frame_host_ = base::MakeUnique<content::DelegatedFrameHost>( delegated_frame_host_ = base::MakeUnique<content::DelegatedFrameHost>(
AllocateFrameSinkId(is_guest_view_hack), this); AllocateFrameSinkId(is_guest_view_hack), this);