Remove the offscreen-render option

We are going to move the APIs to WebContents

diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index b88c375..9121f0c 100644 (file)
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -167,9 +167,6 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   options.Get(switches::kTitle, &title);
   SetTitle(title);
 
-  offscreen_ = false;
-  options.Get(switches::kOffScreenRender, &offscreen_);
-
   // Then show it.
   bool show = true;
   options.Get(switches::kShow, &show);
@@ -297,8 +294,6 @@ void NativeWindow::CapturePage(const gfx::Rect& rect,
 }
 
 void NativeWindow::SetFrameSubscription(bool isOffscreen) {
-  if (!isOffscreen && !offscreen_) return;
-
   const auto view = web_contents()->GetRenderWidgetHostView();
 
   if (view) {
@@ -314,8 +309,6 @@ void NativeWindow::SetFrameSubscription(bool isOffscreen) {
     } else {
       view->EndFrameSubscription();
     }
-
-    offscreen_ = isOffscreen;
   }
 }
 
@@ -520,10 +513,6 @@ void NativeWindow::SendMouseWheelEvent(int modifiers, int x, int y, bool precise
   host->ForwardWheelEvent(*wheel_event);
 }
 
-void NativeWindow::DidFinishLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url) {
-  SetFrameSubscription(offscreen_);
-}
-
 void NativeWindow::RenderViewCreated(
     content::RenderViewHost* render_view_host) {
   if (!transparent_)

diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
index e7de4eb..5784743 100644 (file)
--- a/atom/browser/native_window.h
+++ b/atom/browser/native_window.h
@@ -246,7 +246,6 @@ class NativeWindow : public content::WebContentsObserver,
 
   // content::WebContentsObserver:
   void RenderViewCreated(content::RenderViewHost* render_view_host) override;
-  void DidFinishLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url) override;
   void BeforeUnloadDialogCancelled() override;
   void TitleWasSet(content::NavigationEntry* entry, bool explicit_set) override;
   bool OnMessageReceived(const IPC::Message& message) override;
@@ -267,8 +266,6 @@ class NativeWindow : public content::WebContentsObserver,
                          const SkBitmap& bitmap,
                          content::ReadbackResponse response);
 
-  bool offscreen_;
-
   // Whether window has standard frame.
   bool has_frame_;
 

diff --git a/atom/common/options_switches.cc b/atom/common/options_switches.cc
index 75688ec..2268a40 100644 (file)
--- a/atom/common/options_switches.cc
+++ b/atom/common/options_switches.cc
@@ -116,8 +116,6 @@ const char kRegisterStandardSchemes[] = "register-standard-schemes";
 // The browser process app model ID
 const char kAppUserModelId[] = "app-user-model-id";
 
-const char kOffScreenRender[] = "offscreen-render";
-
 const char kModifiers[] = "modifiers";
 const char kKeyCode[] = "code";
 const char kNativeKeyCode[] = "native";

diff --git a/atom/common/options_switches.h b/atom/common/options_switches.h
index 6ce6d7f..eb7842e 100644 (file)
--- a/atom/common/options_switches.h
+++ b/atom/common/options_switches.h
@@ -62,8 +62,6 @@ extern const char kRegisterStandardSchemes[];
 
 extern const char kAppUserModelId[];
 
-extern const char kOffScreenRender[];
-
 extern const char kModifiers[];
 extern const char kKeyCode[];
 extern const char kNativeKeyCode[];