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

small fixes

Browse source
This commit is contained in:
Heilig Benedek 2016-08-02 12:56:03 +02:00
parent 935d47d83e
commit 9068182664
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/osr_render_widget_host_view.cc
View file

@ -381,7 +381,9 @@ OffScreenRenderWidgetHostView::~OffScreenRenderWidgetHostView() {
delegated_frame_host_->WasHidden(); delegated_frame_host_->WasHidden();
delegated_frame_host_->ResetCompositor(); delegated_frame_host_->ResetCompositor();
#if defined(OS_MACOSX)
DestroyPlatformWidget(); DestroyPlatformWidget();
#endif
if (copy_frame_generator_.get()) if (copy_frame_generator_.get())
copy_frame_generator_.reset(NULL); copy_frame_generator_.reset(NULL);

10
atom/browser/osr_render_widget_host_view.h
View file

@ -237,18 +237,10 @@ private:
gfx::AcceleratedWidget compositor_widget_; gfx::AcceleratedWidget compositor_widget_;
std::unique_ptr<ui::Layer> root_layer_; std::unique_ptr<ui::Layer> root_layer_;
#if defined(OS_WIN) #if defined(OS_MACOSX)
std::unique_ptr<gfx::WindowImpl> window_;
#elif defined(OS_MACOSX)
NSWindow* window_; NSWindow* window_;
CALayer* background_layer_; CALayer* background_layer_;
std::unique_ptr<content::BrowserCompositorMac> browser_compositor_; std::unique_ptr<content::BrowserCompositorMac> browser_compositor_;
#elif defined(USE_X11)
CefWindowX11* window_;
std::unique_ptr<ui::XScopedCursor> invisible_cursor_;
#endif
#if defined(OS_MACOSX)
NSTextInputContext* text_input_context_osr_mac_; NSTextInputContext* text_input_context_osr_mac_;
// Selected text on the renderer. // Selected text on the renderer.