Merge ~santoshbit2007/oxide:scrollbar_work into oxide:master

[Santosh]

Implement scrollbar switch when shell mode is changed.

When shell mode is window mode it shows desktop style scrollbar in mobile
Switching happens dynamically.

[Santosh (santoshbit2007)]

overlay scrollbar is controlled by cmd flags --enable-overlay-scrollbar(disable). Disabling overlay scrollbar using cmd require renderer process restart. so I am not changing command line parameter at runtime instead using the blink Runtime setting to disable overlay scrollbar which is enough to disable the overlayscrollbar from blink.
But outside blink chromium checks for cmd params to find type of scrollbar.
So internal of blink may know overlay scrollbar is disabled but at the same time outside of blink
may see its enabled.

But as of now its all fine, as outside blink there is only one place of checking of "type of scrollbar" which is overridden in oxide_content_render_client::OverrideCompositorSettings.

So now ui::IsOverlayScrollbarEnabled(); will return wrong value when convergence is in picture.

[Chris Coulson (chrisccoulson)]

Thanks, I've left some comments inline.

Also, this appears to still rely on GetFormFactor() to add --enable-overlay-scrollbar to the commandline, but I really want to get rid of that (bug 1548304).

And I'd prefer not to expose ShellMode to the renderer side - I'd rather we just exposed the desired scrollbar configuration

review: Needs Fixing

Unmerged commits

37f64b2... by Santosh on 2016-11-10

Implement scrollbar switch when shell mode is changed.

diff --git a/shared/BUILD.gn b/shared/BUILD.gn
index c847f04..3976892 100644
--- a/shared/BUILD.gn
+++ b/shared/BUILD.gn
@@ -456,6 +456,8 @@ component("shared") {
     "browser/screen.h",
     "browser/screen_observer.cc",
     "browser/screen_observer.h",
+    "browser/scrollbar_type.cc",
+    "browser/scrollbar_type.h",
     "browser/shell_mode.h",
     "browser/ssl/oxide_certificate_error.cc",
     "browser/ssl/oxide_certificate_error.h",
@@ -556,6 +558,8 @@ component("shared") {
     "renderer/oxide_v8_scoped_persistent.h",
     "renderer/oxide_web_content_settings_client.cc",
     "renderer/oxide_web_content_settings_client.h",
+    "renderer/oxide_scrollbar_state.cc",
+    "renderer/oxide_scrollbar_state.h"
   ]
 
   if (is_linux) {
diff --git a/shared/browser/oxide_content_browser_client.cc b/shared/browser/oxide_content_browser_client.cc
index 876b1ad..7cd6777 100644
--- a/shared/browser/oxide_content_browser_client.cc
+++ b/shared/browser/oxide_content_browser_client.cc
@@ -45,6 +45,7 @@
 #include "shared/browser/ssl/oxide_certificate_error_dispatcher.h"
 #include "shared/common/oxide_constants.h"
 #include "shared/common/oxide_content_client.h"
+#include "shared/common/oxide_messages.h"
 
 #include "display_form_factor.h"
 #include "in_process_renderer_observer.h"
@@ -60,6 +61,7 @@
 #include "oxide_user_agent_settings.h"
 #include "oxide_web_contents_view.h"
 #include "screen.h"
+#include "scrollbar_type.h"
 #include "shell_mode.h"
 #include "web_contents_client.h"
 #include "web_contents_helper.h"
@@ -100,6 +102,7 @@ void ContentBrowserClient::RenderProcessWillLaunch(
   }
 
   host->AddFilter(new RenderMessageFilter(host));
+  host->Send(new OxideMsg_ChangeScrollbarType(IsScrollbarTypeOverlay()));
 }
 
 void ContentBrowserClient::SiteInstanceGotProcess(
@@ -304,11 +307,14 @@ void ContentBrowserClient::OverrideWebkitPrefs(
     prefs->shrinks_viewport_contents_to_fit = true;
     prefs->viewport_enabled = true;
     prefs->main_frame_resizes_are_orientation_changes = true;
+    prefs->use_solid_color_scrollbars = true;
   } else {
     prefs->shrinks_viewport_contents_to_fit = false;
     prefs->default_minimum_page_scale_factor = 1.0f;
     prefs->viewport_enabled = false;
     prefs->main_frame_resizes_are_orientation_changes = false;
+    // Aura(desktop) overlay scrollbar never use solid color scrollbars
+    prefs->use_solid_color_scrollbars = false;
   }
 
   prefs->supports_multiple_windows = false;
@@ -317,7 +323,6 @@ void ContentBrowserClient::OverrideWebkitPrefs(
         contents_helper->client()->CanCreateWindows();
   }
 
-  prefs->use_solid_color_scrollbars = ui::IsOverlayScrollbarEnabled();
 }
 
 content::DevToolsManagerDelegate*
diff --git a/shared/browser/scrollbar_type.cc b/shared/browser/scrollbar_type.cc
 new file mode 100644
index 0000000..4f7feba
--- /dev/null
+++ b/shared/browser/scrollbar_type.cc
@@ -0,0 +1,37 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2016 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+#include "shared/browser/scrollbar_type.h"
+
+#include "ui/native_theme/native_theme_switches.h"
+
+#include "screen.h"
+#include "shell_mode.h"
+
+namespace oxide {
+
+bool IsScrollbarTypeOverlay() {
+  bool is_overlay = ui::IsOverlayScrollbarEnabled();
+  ShellMode mode = Screen::GetInstance()->GetShellMode();
+  if (mode == ShellMode::Windowed) {
+    is_overlay = false;
+  }
+
+  return is_overlay;
+}
+
+}  // namespace oxide
diff --git a/shared/browser/scrollbar_type.h b/shared/browser/scrollbar_type.h
 new file mode 100644
index 0000000..171a5ab
--- /dev/null
+++ b/shared/browser/scrollbar_type.h
@@ -0,0 +1,27 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2016 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+#ifndef _OXIDE_SHARED_BROWSER_SCROLLBAR_TYPE_H_
+#define _OXIDE_SHARED_BROWSER_SCROLLBAR_TYPE_H_
+
+namespace oxide {
+
+bool IsScrollbarTypeOverlay();
+
+}  // namespace oxide
+
+#endif
diff --git a/shared/browser/web_contents_helper.cc b/shared/browser/web_contents_helper.cc
index ebcead1..8c0130a 100644
--- a/shared/browser/web_contents_helper.cc
+++ b/shared/browser/web_contents_helper.cc
@@ -21,18 +21,21 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "ui/display/display.h"
 
 #include "shared/common/oxide_content_client.h"
+#include "shared/common/oxide_messages.h"
 
 #include "oxide_browser_context.h"
 #include "oxide_user_agent_settings.h"
 #include "oxide_web_contents_unloader.h"
 #include "oxide_web_contents_view.h"
 #include "oxide_web_view.h"
+#include "scrollbar_type.h"
 #include "web_preferences.h"
 
 namespace oxide {
@@ -126,6 +129,12 @@ void WebContentsHelper::OnDisplayPropertiesChanged(
 
 void WebContentsHelper::OnShellModeChanged() {
   SyncWebPreferences();
+  for (content::RenderProcessHost::iterator rph_iter(
+           content::RenderProcessHost::AllHostsIterator());
+       !rph_iter.IsAtEnd(); rph_iter.Advance()) {
+    rph_iter.GetCurrentValue()->Send(
+        new OxideMsg_ChangeScrollbarType(IsScrollbarTypeOverlay()));
+  }
 }
 
 // static
diff --git a/shared/common/oxide_messages.h b/shared/common/oxide_messages.h
index 0375b9b..d4cb12d 100644
--- a/shared/common/oxide_messages.h
+++ b/shared/common/oxide_messages.h
@@ -43,6 +43,8 @@ IPC_MESSAGE_CONTROL1(OxideMsg_UpdateUserScripts,
 IPC_MESSAGE_CONTROL1(OxideMsg_SetUserAgent,
                      std::string)
 
+IPC_MESSAGE_CONTROL1(OxideMsg_ChangeScrollbarType, bool)
+
 IPC_MESSAGE_ROUTED1(OxideMsg_SendMessage,
                     oxide::ScriptMessageParams)
 
diff --git a/shared/renderer/oxide_content_renderer_client.cc b/shared/renderer/oxide_content_renderer_client.cc
index 934c19b..063f51b 100644
--- a/shared/renderer/oxide_content_renderer_client.cc
+++ b/shared/renderer/oxide_content_renderer_client.cc
@@ -40,6 +40,7 @@
 #include "browser_controls_handler.h"
 #include "oxide_renderer_user_agent_settings.h"
 #include "oxide_script_message_dispatcher_renderer.h"
+#include "oxide_scrollbar_state.h"
 #include "oxide_user_script_scheduler.h"
 #include "oxide_user_script_slave.h"
 #include "oxide_web_content_settings_client.h"
@@ -60,7 +61,10 @@ void ContentRendererClient::RenderThreadStarted() {
 
   user_agent_settings_.reset(new RendererUserAgentSettings());
   thread->AddObserver(user_agent_settings_.get());
-  
+
+  scrollbar_state_.reset(new ScrollbarState());
+  thread->AddObserver(scrollbar_state_.get());
+
   new UserScriptSlave();
 
   net::NetModule::SetResourceProvider(NetResourceProvider);
@@ -149,7 +153,8 @@ void ContentRendererClient::OverrideCompositorSettings(
   //  be able to have 2 different overlay scrollbar styles (a small
   //  non-hit-tested style for mobile and a much larger hit-tested style
   //  for desktop)
-  if (ui::IsOverlayScrollbarEnabled()) {
+  if (ui::IsOverlayScrollbarEnabled() &&
+      (scrollbar_state_->IsScrollbarTypeOverlay())) {
     // XXX: This will need updating if we support overlay scrollbars on
     //  desktop. See https://launchpad.net/bugs/1426567
     settings->scrollbar_animator = cc::LayerTreeSettings::LINEAR_FADE;
diff --git a/shared/renderer/oxide_content_renderer_client.h b/shared/renderer/oxide_content_renderer_client.h
index 9dbb950..5f971d9 100644
--- a/shared/renderer/oxide_content_renderer_client.h
+++ b/shared/renderer/oxide_content_renderer_client.h
@@ -30,6 +30,7 @@ class RendererMediaPlayerManager;
 #endif
 
 class RendererUserAgentSettings;
+class ScrollbarState;
 
 class ContentRendererClient : public content::ContentRendererClient {
  public:
@@ -59,6 +60,7 @@ class ContentRendererClient : public content::ContentRendererClient {
   std::string GetUserAgentOverrideForURL(const GURL& url) override;
 
   std::unique_ptr<RendererUserAgentSettings> user_agent_settings_;
+  std::unique_ptr<ScrollbarState> scrollbar_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentRendererClient);
 };
diff --git a/shared/renderer/oxide_scrollbar_state.cc b/shared/renderer/oxide_scrollbar_state.cc
 new file mode 100644
index 0000000..e414f1e
--- /dev/null
+++ b/shared/renderer/oxide_scrollbar_state.cc
@@ -0,0 +1,54 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+#include "shared/renderer/oxide_scrollbar_state.h"
+
+#include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "third_party/WebKit/public/web/WebView.h"
+
+#include "base/command_line.h"
+#include "content/public/renderer/render_frame.h"
+#include "ipc/ipc_message_macros.h"
+#include "ui/native_theme/native_theme_switches.h"
+
+#include "shared/common/oxide_constants.h"
+#include "shared/common/oxide_messages.h"
+
+namespace oxide {
+
+ScrollbarState::ScrollbarState() {
+  scrollbar_type_overlay_ = ui::IsOverlayScrollbarEnabled();
+}
+
+ScrollbarState::~ScrollbarState() {}
+
+bool ScrollbarState::OnControlMessageReceived(const IPC::Message& message) {
+  bool handled = true;
+  IPC_BEGIN_MESSAGE_MAP(ScrollbarState, message)
+    IPC_MESSAGE_HANDLER(OxideMsg_ChangeScrollbarType, OnChangeScrollbarType)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+
+  return handled;
+}
+
+void ScrollbarState::OnChangeScrollbarType(bool is_overlay) {
+  scrollbar_type_overlay_ = is_overlay;
+  blink::WebRuntimeFeatures::enableOverlayScrollbars(is_overlay);
+}
+
+}  // namespace oxide
diff --git a/shared/renderer/oxide_scrollbar_state.h b/shared/renderer/oxide_scrollbar_state.h
 new file mode 100644
index 0000000..f643d3f
--- /dev/null
+++ b/shared/renderer/oxide_scrollbar_state.h
@@ -0,0 +1,47 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+#ifndef _OXIDE_SHARED_RENDERER_SHELL_MODE_STATE_H_
+#define _OXIDE_SHARED_RENDERER_SHELL_MODE_STATE_H_
+
+#include "content/public/renderer/render_thread_observer.h"
+
+#include "shared/browser/shell_mode.h"
+
+namespace oxide {
+
+class ScrollbarState : public content::RenderThreadObserver {
+ public:
+  ScrollbarState();
+  ~ScrollbarState() override;
+
+  bool IsScrollbarTypeOverlay() const { return scrollbar_type_overlay_; }
+
+ private:
+  // RenderThreadObserver implementation
+  bool OnControlMessageReceived(const IPC::Message& message) override;
+
+  void OnChangeScrollbarType(bool is_overlay);
+
+  bool scrollbar_type_overlay_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScrollbarState);
+};
+
+}  // namespace oxide
+
+#endif  // _OXIDE_SHARED_RENDERER_SHELL_MODE_STATE_H_