diff --git a/atom/browser/osr/osr_render_widget_host_view.h b/atom/browser/osr/osr_render_widget_host_view.h index 74da984363ab..4bd652a0867b 100644 --- a/atom/browser/osr/osr_render_widget_host_view.h +++ b/atom/browser/osr/osr_render_widget_host_view.h @@ -177,7 +177,7 @@ class OffScreenRenderWidgetHostView // ui::AcceleratedWidgetMacNSView: NSView* AcceleratedWidgetGetNSView() const override; void AcceleratedWidgetGetVSyncParameters( - base::TimeTicks* timebase, base::TimeDelta* interval) const override; + base::TimeTicks* timebase, base::TimeDelta* interval) const override; void AcceleratedWidgetSwapCompleted() override; #endif // defined(OS_MACOSX) diff --git a/atom/browser/osr/osr_render_widget_host_view_mac.mm b/atom/browser/osr/osr_render_widget_host_view_mac.mm index 511012f5db23..06650b7bbb24 100644 --- a/atom/browser/osr/osr_render_widget_host_view_mac.mm +++ b/atom/browser/osr/osr_render_widget_host_view_mac.mm @@ -7,7 +7,6 @@ #import #include "base/strings/utf_string_conversions.h" -#include "ui/accelerated_widget_mac/accelerated_widget_mac.h" ui::AcceleratedWidgetMac* atom::OffScreenRenderWidgetHostView::GetAcceleratedWidgetMac() const { @@ -16,9 +15,8 @@ atom::OffScreenRenderWidgetHostView::GetAcceleratedWidgetMac() const { return nullptr; } -NSView* atom::OffScreenRenderWidgetHostView::AcceleratedWidgetGetNSView() - const { - return [window_ contentView]; +NSView* atom::OffScreenRenderWidgetHostView::AcceleratedWidgetGetNSView() const { + return [native_window_->GetNativeWindow() contentView]; } void atom::OffScreenRenderWidgetHostView::AcceleratedWidgetGetVSyncParameters( @@ -72,17 +70,6 @@ void atom::OffScreenRenderWidgetHostView::SelectionChanged( } void atom::OffScreenRenderWidgetHostView::CreatePlatformWidget() { - window_ = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 1, 1) - styleMask:NSBorderlessWindowMask - backing:NSBackingStoreBuffered - defer:NO]; - - background_layer_ = [[[CALayer alloc] init] retain]; - [background_layer_ setBackgroundColor:CGColorGetConstantColor(kCGColorClear)]; - NSView* content_view = [window_ contentView]; - [content_view setLayer:background_layer_]; - [content_view setWantsLayer:YES]; - browser_compositor_ = content::BrowserCompositorMac::Create(); compositor_.reset(browser_compositor_->compositor()); @@ -95,19 +82,11 @@ void atom::OffScreenRenderWidgetHostView::CreatePlatformWidget() { } void atom::OffScreenRenderWidgetHostView::DestroyPlatformWidget() { - DCHECK(window_); - ui::Compositor* compositor = compositor_.release(); ALLOW_UNUSED_LOCAL(compositor); - [window_ close]; - window_ = nil; - [background_layer_ release]; - background_layer_ = nil; - browser_compositor_->accelerated_widget_mac()->ResetNSView(); browser_compositor_->compositor()->SetVisible(false); browser_compositor_->compositor()->SetScaleAndSize(1.0, gfx::Size(0, 0)); browser_compositor_->compositor()->SetRootLayer(NULL); - content::BrowserCompositorMac::Recycle(std::move(browser_compositor_)); }