Merge lp:~gerboland/oxide/1.12-dynamic-grid-units into lp:oxide/1.12

[Michał Sawicz]

[lp:~gerboland/oxide/1.12-dynamic-grid-units]

1314. By Gerry Boland on 2016-02-19

Fix signal name typo

[Chris Coulson (chrisccoulson)]

Sorry, but backporting code refactorings like this to a stable branch is a nack. And this needs to land on trunk first, and then next (currently 1.13) - it should have a bug report targeted to the branches it needs to land on.

Normally only security fixes and critical regressions land on the stable branch. There's still a chance we might need to spin security updates for all releases from this branch, so we don't accept changes that introduce significant risk.

The stuff you've backported is completely unnecessary - ScreenClient isn't used for retrieving display information for visible webviews, even on trunk (I'm currently doing some work to refactor how this works). Screen information comes directly from the webview itself.

review: Needs Fixing

Unmerged revisions

1314. By Gerry Boland on 2016-02-19

Fix signal name typo

1313. By Gerry Boland on 2016-02-18

Fix build fail, gfx::Screen has no GetScreen method, trying GetNativeScreen

1312. By Gerry Boland on 2016-02-18

Adding forgotton file

1311. By Loïc Molinari on 2016-02-18

Added support for scale factor retrieved from the Ubuntu QPA plugin.

1310. By Chris Coulson on 2016-02-18

Backport ScreenInfo patch from oxide trunk

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2016-01-12 16:42:49 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2016-02-19 12:04:49 +0000
@@ -22,7 +22,6 @@
 #include <QEvent>
 #include <QGuiApplication>
 #include <QPointer>
-#include <QScreen>
 #include <QString>
 #include <QThread>
 #include <QTouchDevice>
@@ -43,7 +42,7 @@
 #include "oxide_qt_clipboard.h"
 #include "oxide_qt_location_provider.h"
 #include "oxide_qt_message_pump.h"
-#include "oxide_qt_screen_utils.h"
+#include "oxide_qt_screen_client.h"
 
 namespace oxide {
 namespace qt {
@@ -85,16 +84,6 @@
   NotifyClipboardDataChanged();
 }
 
-void BrowserPlatformIntegration::OnScreenGeometryChanged(
-    const QRect& geometry) {
-  UpdateDefaultScreenInfo();
-}
-
-void BrowserPlatformIntegration::OnScreenOrientationChanged(
-    Qt::ScreenOrientation orientation) {
-  UpdateDefaultScreenInfo();
-}
-
 void BrowserPlatformIntegration::UpdateApplicationState() {
   ApplicationState state = CalculateApplicationState(suspended_);
   if (state == state_) {
@@ -106,12 +95,6 @@
   NotifyApplicationStateChanged();
 }
 
-void BrowserPlatformIntegration::UpdateDefaultScreenInfo() {
-  base::AutoLock lock(default_screen_info_lock_);
-  default_screen_info_ =
-      GetWebScreenInfoFromQScreen(QGuiApplication::primaryScreen());
-}
-
 bool BrowserPlatformIntegration::LaunchURLExternally(const GURL& url) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
@@ -144,9 +127,8 @@
                                    QGuiApplication::primaryScreen()));
 }
 
-blink::WebScreenInfo BrowserPlatformIntegration::GetDefaultScreenInfo() {
-  base::AutoLock lock(default_screen_info_lock_);
-  return default_screen_info_;
+oxide::ScreenClient* BrowserPlatformIntegration::GetScreenClient() {
+  return screen_client_.get();
 }
 
 oxide::GLContextDependent* BrowserPlatformIntegration::GetGLShareContext() {
@@ -211,24 +193,8 @@
 BrowserPlatformIntegration::BrowserPlatformIntegration()
     : application_name_(qApp->applicationName().toStdString()),
       suspended_(false),
-      state_(CalculateApplicationState(false)) {
-  QScreen* primary_screen = QGuiApplication::primaryScreen();
-  primary_screen->setOrientationUpdateMask(Qt::LandscapeOrientation |
-                                           Qt::PortraitOrientation |
-                                           Qt::InvertedLandscapeOrientation |
-                                           Qt::InvertedPortraitOrientation);
-  connect(primary_screen, SIGNAL(virtualGeometryChanged(const QRect&)),
-          SLOT(OnScreenGeometryChanged(const QRect&)));
-  connect(primary_screen, SIGNAL(geometryChanged(const QRect&)),
-          SLOT(OnScreenGeometryChanged(const QRect&)));
-  connect(primary_screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
-          SLOT(OnScreenOrientationChanged(Qt::ScreenOrientation)));
-  connect(primary_screen,
-          SIGNAL(primaryOrientationChanged(Qt::ScreenOrientation)),
-          SLOT(OnScreenOrientationChanged(Qt::ScreenOrientation)));
-
-  UpdateDefaultScreenInfo();
-
+      state_(CalculateApplicationState(false)),
+      screen_client_(new ScreenClient()) {
   connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)),
           SLOT(OnApplicationStateChanged()));
   connect(QGuiApplication::clipboard(), SIGNAL(dataChanged()),

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.h'
--- qt/core/browser/oxide_qt_browser_platform_integration.h	2016-01-12 16:42:49 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.h	2016-02-19 12:04:49 +0000
@@ -23,7 +23,6 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/synchronization/lock.h"
 
 #include "shared/browser/oxide_browser_platform_integration.h"
 
@@ -34,6 +33,8 @@
 namespace oxide {
 namespace qt {
 
+class ScreenClient;
+
 class BrowserPlatformIntegration : public QObject,
                                    public oxide::BrowserPlatformIntegration {
   Q_OBJECT
@@ -45,18 +46,15 @@
  private Q_SLOTS:
   void OnApplicationStateChanged();
   void OnClipboardDataChanged();
-  void OnScreenGeometryChanged(const QRect& geometry);
-  void OnScreenOrientationChanged(Qt::ScreenOrientation orientation);
 
  private:
   void UpdateApplicationState();
-  void UpdateDefaultScreenInfo();
 
   // oxide::BrowserPlatformIntegration implementation
   bool LaunchURLExternally(const GURL& url) override;
   bool IsTouchSupported() override;
   intptr_t GetNativeDisplay() override;
-  blink::WebScreenInfo GetDefaultScreenInfo() override;
+  oxide::ScreenClient* GetScreenClient() override;
   oxide::GLContextDependent* GetGLShareContext() override;
   scoped_ptr<oxide::MessagePump> CreateUIMessagePump() override;
   ui::Clipboard* CreateClipboard() override;
@@ -89,8 +87,7 @@
   // when the state really does change
   ApplicationState state_;
 
-  base::Lock default_screen_info_lock_;
-  blink::WebScreenInfo default_screen_info_;
+  scoped_ptr<ScreenClient> screen_client_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPlatformIntegration);
 };

=== added file 'qt/core/browser/oxide_qt_screen_client.cc'
--- qt/core/browser/oxide_qt_screen_client.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_screen_client.cc	2016-02-19 12:04:49 +0000
@@ -0,0 +1,115 @@
+// 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 "oxide_qt_screen_client.h"
+
+#include <QGuiApplication>
+#include <QRect>
+#include <QScreen>
+
+#include "base/logging.h"
+#include "ui/gfx/display.h"
+#include "ui/gfx/geometry/rect.h"
+
+#include "oxide_qt_screen_utils.h"
+
+namespace oxide {
+namespace qt {
+
+void ScreenClient::OnScreenGeometryChanged(const QRect& geometry) {
+  UpdatePrimaryDisplay();
+}
+
+void ScreenClient::OnScreenOrientationChanged(
+    Qt::ScreenOrientation orientation) {
+  UpdatePrimaryDisplay();
+}
+
+void ScreenClient::OnScreenPropertyChanged(
+    QPlatformScreen *screen, const QString &propertyName) {
+  if (propertyName == QStringLiteral("scale") &&
+      screen == QGuiApplication::primaryScreen()->handle()) {
+    UpdatePrimaryDisplay();
+  }
+}
+
+void ScreenClient::UpdatePrimaryDisplay() {
+  base::AutoLock lock(primary_display_lock_);
+
+  QScreen* screen = QGuiApplication::primaryScreen();
+
+  primary_display_.set_id(0);
+  primary_display_.set_touch_support(gfx::Display::TOUCH_SUPPORT_UNKNOWN);
+  primary_display_.set_device_scale_factor(
+      GetDeviceScaleFactorFromQScreen(screen));
+
+  QRect rect = screen->geometry();
+  primary_display_.set_bounds(gfx::Rect(rect.x(),
+                                        rect.y(),
+                                        rect.width(),
+                                        rect.height()));
+
+  QRect work_area = screen->availableGeometry();
+  primary_display_.set_work_area(gfx::Rect(work_area.x(),
+                                           work_area.y(),
+                                           work_area.width(),
+                                           work_area.height()));
+
+  primary_display_.SetRotationAsDegree(
+      screen->angleBetween(screen->nativeOrientation(),
+                           screen->orientation()));
+}
+
+gfx::Display ScreenClient::GetPrimaryDisplay() {
+  base::AutoLock lock(primary_display_lock_);
+  return primary_display_;
+}
+
+gfx::Point ScreenClient::GetCursorScreenPoint() {
+  NOTIMPLEMENTED();
+}
+
+ScreenClient::ScreenClient() {
+  QScreen* primary_screen = QGuiApplication::primaryScreen();
+  primary_screen->setOrientationUpdateMask(Qt::LandscapeOrientation |
+                                           Qt::PortraitOrientation |
+                                           Qt::InvertedLandscapeOrientation |
+                                           Qt::InvertedPortraitOrientation);
+  connect(primary_screen, SIGNAL(virtualGeometryChanged(const QRect&)),
+          SLOT(OnScreenGeometryChanged(const QRect&)));
+  connect(primary_screen, SIGNAL(geometryChanged(const QRect&)),
+          SLOT(OnScreenGeometryChanged(const QRect&)));
+  connect(primary_screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
+          SLOT(OnScreenOrientationChanged(Qt::ScreenOrientation)));
+  connect(primary_screen,
+          SIGNAL(primaryOrientationChanged(Qt::ScreenOrientation)),
+          SLOT(OnScreenOrientationChanged(Qt::ScreenOrientation)));
+
+  QString platform = QGuiApplication::platformName();
+  if (platform.startsWith("ubuntu") || platform == "mirserver") {
+    connect(QGuiApplication::platformNativeInterface(),
+            SIGNAL(screenPropertyChanged(QPlatformScreen*, const QString&)),
+            SLOT(OnScreenPropertyChanged(QPlatformScreen*, const QString&)));
+  }
+
+  UpdatePrimaryDisplay();
+}
+
+ScreenClient::~ScreenClient() {}
+
+} // namespace qt
+} // namespace oxide

=== added file 'qt/core/browser/oxide_qt_screen_client.h'
--- qt/core/browser/oxide_qt_screen_client.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_screen_client.h	2016-02-19 12:04:49 +0000
@@ -0,0 +1,61 @@
+// 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_QT_CORE_BROWSER_SCREEN_CLIENT_H_
+#define _OXIDE_QT_CORE_BROWSER_SCREEN_CLIENT_H_
+
+#include <QObject>
+#include <QtGlobal>
+#include <QtGui/qpa/qplatformnativeinterface.h>
+#include <QtGui/qpa/qplatformscreen.h>
+
+#include "base/macros.h"
+#include "base/synchronization/lock.h"
+
+#include "shared/browser/oxide_screen_client.h"
+
+namespace oxide {
+namespace qt {
+
+class ScreenClient : public QObject,
+                     public oxide::ScreenClient {
+  Q_OBJECT
+
+ public:
+  ScreenClient();
+  ~ScreenClient() override;
+
+ private Q_SLOTS:
+  void OnScreenGeometryChanged(const QRect& geometry);
+  void OnScreenOrientationChanged(Qt::ScreenOrientation orientation);
+  void OnScreenPropertyChanged(QPlatformScreen* screen, const QString& propertyName);
+
+ private:
+  void UpdatePrimaryDisplay();
+
+  // oxide::ScreenClient implementation
+  gfx::Display GetPrimaryDisplay() override;
+  gfx::Point GetCursorScreenPoint() override;
+
+  base::Lock primary_display_lock_;
+  gfx::Display primary_display_;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_SCREEN_CLIENT_H_

=== modified file 'qt/core/browser/oxide_qt_screen_utils.cc'
--- qt/core/browser/oxide_qt_screen_utils.cc	2015-11-27 21:35:14 +0000
+++ qt/core/browser/oxide_qt_screen_utils.cc	2016-02-19 12:04:49 +0000
@@ -22,12 +22,11 @@
 #include <QRect>
 #include <QScreen>
 #include <QString>
+#include <QtGui/qpa/qplatformnativeinterface.h>
 
 #include "third_party/WebKit/public/platform/modules/screen_orientation/WebScreenOrientationType.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 
-#include "shared/common/oxide_form_factor.h"
-
 namespace oxide {
 namespace qt {
 
@@ -53,14 +52,15 @@
 }
 
 float GetDeviceScaleFactorFromQScreen(QScreen* screen) {
-  // For some reason, the Ubuntu QPA plugin doesn't override
-  // QScreen::devicePixelRatio. However, applications using the Ubuntu
-  // SDK use something called "grid units". The relationship between
-  // grid units and device pixels is set by the "GRID_UNIT_PX" environment
-  // variable. On a screen with a DPR of 1.0f, GRID_UNIT_PX is set to 8, and
-  // 1 grid unit == 8 device pixels.
-  // If we are using the Ubuntu backend, we use GRID_UNIT_PX to derive the
-  // device pixel ratio, else we get it from QScreen::devicePixelRatio.
+  // Because it only supports integer scale factors, the Ubuntu QPA plugin
+  // doesn't use the default Qt devicePixelRatio but a custom scaling system
+  // based on grid units. The relationship between grid units and device pixels
+  // is set by the "GRID_UNIT_PX" environment variable. On a screen with a scale
+  // factor of 1, GRID_UNIT_PX is set to 8, and 1 grid unit == 8 device pixels.
+  // If the Ubuntu backend is used, we retrieve scale factors from the QPA
+  // plugin. For old versions that don't expose these factors, we deduce the
+  // scale factor by reading the "GRID_UNIT_PX" environment variable.
+  //
   // XXX: There are 2 scenarios where this is completely broken:
   //      1) Any apps not using the Ubuntu SDK but running with the Ubuntu
   //         QPA plugin. In this case, we derive a DPR from GRID_UNIT_PX if
@@ -87,6 +87,15 @@
 
   QString platform = QGuiApplication::platformName();
   if (platform.startsWith("ubuntu") || platform == "mirserver") {
+
+    QPlatformNativeInterface* interface =
+        QGuiApplication::platformNativeInterface();
+    void* data =
+        interface->nativeResourceForScreen(QByteArray("scale"), screen);
+    if (data) {
+      return *reinterpret_cast<float*>(data);
+    }
+
     QByteArray grid_unit_px(qgetenv("GRID_UNIT_PX"));
     bool ok;
     float scale = grid_unit_px.toFloat(&ok);
@@ -101,24 +110,18 @@
 blink::WebScreenInfo GetWebScreenInfoFromQScreen(QScreen* screen) {
   blink::WebScreenInfo result;
 
-  result.depth = screen->depth();
+  result.depth = 24;
   result.depthPerComponent = 8; // XXX: Copied the GTK impl here
   result.isMonochrome = result.depth == 1;
   result.deviceScaleFactor = GetDeviceScaleFactorFromQScreen(screen);
 
-  QRect rect =
-      screen->mapBetween(Qt::PrimaryOrientation,
-                         screen->orientation(),
-                         screen->geometry());
+  QRect rect = screen->geometry();
   result.rect = blink::WebRect(rect.x(),
                                rect.y(),
                                rect.width(),
                                rect.height());
 
-  QRect availableRect =
-      screen->mapBetween(Qt::PrimaryOrientation,
-                         screen->orientation(),
-                         screen->availableGeometry());
+  QRect availableRect = screen->availableGeometry();
   result.availableRect = blink::WebRect(availableRect.x(),
                                         availableRect.y(),
                                         availableRect.width(),
@@ -127,22 +130,9 @@
   result.orientationType =
       GetOrientationTypeFromScreenOrientation(screen->orientation());
 
-  // We calculate orientationAngle, which is the clockwise rotation of the
-  // content. However, QScreen::primaryOrientation doesn't work properly in
-  // qtubuntu, so we assume it's portrait on phones and landscape elsewhere
-  // See https://launchpad.net/bugs/1520670
-  Qt::ScreenOrientation primary_orientation = Qt::PrimaryOrientation;
-  if (QGuiApplication::platformName().startsWith("ubuntu")) {
-    if (oxide::GetFormFactorHint() == oxide::FORM_FACTOR_PHONE) {
-      primary_orientation = Qt::PortraitOrientation;
-    } else {
-      primary_orientation = Qt::LandscapeOrientation;
-    }
-  }
-
   result.orientationAngle =
       screen->angleBetween(screen->orientation(),
-                           primary_orientation);
+                           screen->nativeOrientation());
 
   return result;
 }

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2016-01-12 16:42:49 +0000
+++ qt/core/core.gyp	2016-02-19 12:04:49 +0000
@@ -60,6 +60,7 @@
       'sources': [
         '<(INTERMEDIATE_DIR)/moc_oxide_qt_browser_platform_integration.cc',
         '<(INTERMEDIATE_DIR)/moc_oxide_qt_input_method_context.cc',
+        '<(INTERMEDIATE_DIR)/moc_oxide_qt_screen_client.cc',
         'api/internal/oxideqmediacapturedevices_p.cc',
         'api/internal/oxideqwebpreferences_p.cc',
         'app/oxide_qt_main.cc',
@@ -89,6 +90,8 @@
         'browser/oxide_qt_location_provider.h',
         'browser/oxide_qt_message_pump.cc',
         'browser/oxide_qt_message_pump.h',
+        'browser/oxide_qt_screen_client.cc',
+        'browser/oxide_qt_screen_client.h',
         'browser/oxide_qt_screen_utils.cc',
         'browser/oxide_qt_screen_utils.h',
         'browser/oxide_qt_script_message.cc',
@@ -154,6 +157,11 @@
       ],
       'actions': [
         {
+          'action_name': 'moc_oxide_qt_screen_client.cc',
+          'moc_input': 'browser/oxide_qt_screen_client.h',
+          'includes': [ 'moc.gypi' ]
+        },
+        {
           'action_name': 'oxide_qt_clipboard.moc',
           'moc_input': 'browser/oxide_qt_clipboard.cc',
           'includes': [ 'moc.gypi' ]

=== modified file 'shared/browser/media/oxide_video_capture_device_hybris.cc'
--- shared/browser/media/oxide_video_capture_device_hybris.cc	2015-12-09 20:33:45 +0000
+++ shared/browser/media/oxide_video_capture_device_hybris.cc	2016-02-19 12:04:49 +0000
@@ -25,6 +25,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/base/video_types.h"
+#include "ui/gfx/display.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
@@ -32,6 +33,7 @@
 
 #include "shared/browser/oxide_android_properties.h"
 #include "shared/browser/oxide_browser_platform_integration.h"
+#include "shared/browser/oxide_screen_client.h"
 
 namespace oxide {
 
@@ -52,9 +54,12 @@
 }
 
 int GetRotation(int orientation) {
-  blink::WebScreenInfo info =
-      BrowserPlatformIntegration::GetInstance()->GetDefaultScreenInfo();
-  return (orientation - info.orientationAngle) % 360;
+  gfx::Display display =
+      BrowserPlatformIntegration::GetInstance()
+        ->GetScreenClient()
+        ->GetPrimaryDisplay();
+  // XXX(chrisccoulson): Make sure this is the correct way around
+  return (orientation - display.RotationAsDegree()) % 360;
 }
 
 }

=== modified file 'shared/browser/oxide_browser_main_parts.cc'
--- shared/browser/oxide_browser_main_parts.cc	2015-10-29 16:48:48 +0000
+++ shared/browser/oxide_browser_main_parts.cc	2016-02-19 12:04:49 +0000
@@ -57,16 +57,13 @@
 #include "oxide_message_pump.h"
 #include "oxide_power_save_blocker.h"
 #include "oxide_render_process_initializer.h"
+#include "oxide_screen_client.h"
 #include "oxide_web_contents_view.h"
 
 namespace oxide {
 
 namespace {
 
-blink::WebScreenInfo DefaultScreenInfoGetter() {
-  return BrowserPlatformIntegration::GetInstance()->GetDefaultScreenInfo();
-}
-
 scoped_ptr<media::VideoCaptureDeviceFactory> CreateVideoCaptureDeviceFactory(
     scoped_ptr<media::VideoCaptureDeviceFactory> delegate) {
   return make_scoped_ptr(new VideoCaptureDeviceFactoryLinux(delegate.Pass()));
@@ -141,27 +138,27 @@
   Screen() {}
 
   gfx::Point GetCursorScreenPoint() final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return gfx::Point();
   }
 
   gfx::NativeWindow GetWindowUnderCursor() final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return nullptr;
   }
 
   gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return nullptr;
   }
 
   int GetNumDisplays() const final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return 1;
   }
 
   std::vector<gfx::Display> GetAllDisplays() const final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return std::vector<gfx::Display>();
   }
 
@@ -170,43 +167,36 @@
     //  is the NativeView for the corresponding RenderWidgetHostView. It would
     //  be nice to find a way to cleverly map this to the associated RWHV and
     //  get the correct display
-    return GetPrimaryDisplay();
+    return gfx::Display();
   }
 
   gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return gfx::Display();
   }
 
   gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
     return gfx::Display();
   }
 
   gfx::Display GetPrimaryDisplay() const final {
-    blink::WebScreenInfo info(
-        BrowserPlatformIntegration::GetInstance()->GetDefaultScreenInfo());
-
-    gfx::Display display;
-    display.set_bounds(info.rect);
-    display.set_work_area(info.availableRect);
-    display.set_device_scale_factor(info.deviceScaleFactor);
-
-    return display;
+    return BrowserPlatformIntegration::GetInstance()
+        ->GetScreenClient()
+        ->GetPrimaryDisplay();
   }
 
   void AddObserver(gfx::DisplayObserver* observer) final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
   }
   void RemoveObserver(gfx::DisplayObserver* observer) final {
-    NOTIMPLEMENTED();
+    NOTREACHED();
   }
 };
 
 } // namespace
 
 void BrowserMainParts::PreEarlyInitialization() {
-  content::SetDefaultScreenInfoGetterOxide(DefaultScreenInfoGetter);
   content::SetWebContentsViewOxideFactory(WebContentsView::Create);
   content::SetPowerSaveBlockerOxideDelegateFactory(CreatePowerSaveBlocker);
   media::SetVideoCaptureDeviceFactoryOverrideFactory(

=== modified file 'shared/browser/oxide_browser_platform_integration.h'
--- shared/browser/oxide_browser_platform_integration.h	2016-01-12 16:42:49 +0000
+++ shared/browser/oxide_browser_platform_integration.h	2016-02-19 12:04:49 +0000
@@ -24,7 +24,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "content/public/browser/browser_thread.h"
-#include "third_party/WebKit/public/platform/WebScreenInfo.h"
 
 class GURL;
 
@@ -32,6 +31,7 @@
 class LocationProvider;
 }
 
+
 namespace ui {
 class Clipboard;
 }
@@ -41,6 +41,7 @@
 class BrowserPlatformIntegrationObserver;
 class GLContextDependent;
 class MessagePump;
+class ScreenClient;
 
 // An abstract interface allowing toolkit-independent code to integrate with
 // toolkit-specific features
@@ -76,8 +77,9 @@
   // Called on the UI thread
   virtual intptr_t GetNativeDisplay() = 0;
 
-  // Return information about the default screen. Can be called on any thread
-  virtual blink::WebScreenInfo GetDefaultScreenInfo() = 0;
+  // Get the ScreenClient implementation. Can be called on any thread
+  // FIXME(chrisccoulson): Make this UI thread only
+  virtual ScreenClient* GetScreenClient() = 0;
 
   // Return the shared GL context provided by the application, if one exists.
   // This will be used for sharing resources between the webview and UI

=== modified file 'shared/browser/oxide_render_widget_host_view.cc'
--- shared/browser/oxide_render_widget_host_view.cc	2016-01-12 16:42:49 +0000
+++ shared/browser/oxide_render_widget_host_view.cc	2016-02-19 12:04:49 +0000
@@ -407,8 +407,7 @@
 
 void RenderWidgetHostView::GetScreenInfo(blink::WebScreenInfo* result) {
   if (!container_) {
-    *result =
-        BrowserPlatformIntegration::GetInstance()->GetDefaultScreenInfo();
+    RenderWidgetHostViewOxide::GetDefaultScreenInfo(result);
     return;
   }
 

=== modified file 'shared/browser/oxide_render_widget_host_view_container.h'
--- shared/browser/oxide_render_widget_host_view_container.h	2016-01-12 16:42:49 +0000
+++ shared/browser/oxide_render_widget_host_view_container.h	2016-02-19 12:04:49 +0000
@@ -65,6 +65,7 @@
 
   virtual gfx::Rect GetViewBoundsDip() const = 0;
 
+  // TODO(chrisccoulson): Return a gfx::Display here
   virtual blink::WebScreenInfo GetScreenInfo() const = 0;
 
   virtual bool HasFocus(const RenderWidgetHostView* view) const = 0;

=== added file 'shared/browser/oxide_screen_client.h'
--- shared/browser/oxide_screen_client.h	1970-01-01 00:00:00 +0000
+++ shared/browser/oxide_screen_client.h	2016-02-19 12:04:49 +0000
@@ -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
+
+#ifndef _OXIDE_SHARED_BROWSER_SCREEN_CLIENT_H_
+#define _OXIDE_SHARED_BROWSER_SCREEN_CLIENT_H_
+
+#include "ui/gfx/display.h"
+#include "ui/gfx/geometry/point.h"
+
+namespace oxide {
+
+class ScreenClient {
+ public:
+  virtual ~ScreenClient() {}
+
+  virtual gfx::Display GetPrimaryDisplay() = 0;
+
+  virtual gfx::Point GetCursorScreenPoint() = 0;
+};
+
+} // namespace oxide
+
+#endif // _OXIDE_SHARED_BROWSER_SCREEN_CLIENT_H_

=== modified file 'shared/port/content/browser/render_widget_host_view_oxide.cc'
--- shared/port/content/browser/render_widget_host_view_oxide.cc	2015-08-04 20:44:09 +0000
+++ shared/port/content/browser/render_widget_host_view_oxide.cc	2016-02-19 12:04:49 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2014 Canonical Ltd.
+// Copyright (C) 2013-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
@@ -19,17 +19,17 @@
 
 #include "base/logging.h"
 #include "content/common/view_messages.h"
+#include "third_party/WebKit/public/platform/WebScreenInfo.h"
+#include "ui/gfx/display.h"
+#include "ui/gfx/screen.h"
 
 namespace content {
 
-namespace {
-DefaultScreenInfoGetter* g_default_screen_info_getter;
-}
-
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(
-    blink::WebScreenInfo* results) {
-  DCHECK(g_default_screen_info_getter);
-  *results = g_default_screen_info_getter();
+    blink::WebScreenInfo* result) {
+  RenderWidgetHostViewOxide::GetWebScreenInfoForDisplay(
+      gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(),
+      result);
 }
 
 void RenderWidgetHostViewOxide::TextInputStateChanged(
@@ -46,8 +46,29 @@
 
 RenderWidgetHostViewOxide::~RenderWidgetHostViewOxide() {}
 
-void SetDefaultScreenInfoGetterOxide(DefaultScreenInfoGetter* getter) {
-  g_default_screen_info_getter = getter;
+// static
+void RenderWidgetHostViewOxide::GetWebScreenInfoForDisplay(
+    const gfx::Display& display,
+    blink::WebScreenInfo* result) {
+  result->deviceScaleFactor = display.device_scale_factor();
+  result->depth = 24;
+  result->depthPerComponent = 8;
+  result->isMonochrome = false;
+  result->rect = display.bounds();
+  result->availableRect = display.work_area();
+
+  // The rotation angle of gfx::Display is the clockwise screen rotation,
+  // whereas the orientationAngle of blink::WebScreenInfo is the clockwise
+  // content rotation
+  result->orientationAngle = display.RotationAsDegree();
+  if (result->orientationAngle == 90) {
+    result->orientationAngle = 270;
+  } else if (result->orientationAngle == 270) {
+    result->orientationAngle = 90;
+  }
+
+  result->orientationType =
+      RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
 }
 
 } // namespace content

=== modified file 'shared/port/content/browser/render_widget_host_view_oxide.h'
--- shared/port/content/browser/render_widget_host_view_oxide.h	2015-08-04 20:44:09 +0000
+++ shared/port/content/browser/render_widget_host_view_oxide.h	2016-02-19 12:04:49 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2014 Canonical Ltd.
+// Copyright (C) 2013-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
@@ -20,13 +20,17 @@
 
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "ui/base/ime/text_input_type.h"
 
 struct ViewHostMsg_TextInputState_Params;
 
+namespace blink {
+class WebScreenInfo;
+}
+
 namespace gfx {
 class Rect;
+class Display;
 }
 
 namespace content {
@@ -36,6 +40,9 @@
  public:
   virtual ~RenderWidgetHostViewOxide();
 
+  static void GetWebScreenInfoForDisplay(const gfx::Display& display,
+                                         blink::WebScreenInfo* result);
+
  private:
   // content::RenderWidgetHostViewBase implementation
   void TextInputStateChanged(
@@ -50,10 +57,6 @@
                                         bool is_anchor_first) = 0;
 };
 
-typedef blink::WebScreenInfo (DefaultScreenInfoGetter)();
-CONTENT_EXPORT void SetDefaultScreenInfoGetterOxide(
-    DefaultScreenInfoGetter* getter);
-
 } // namespace content
 
 #endif // _OXIDE_SHARED_PORT_CONTENT_BROWSER_RENDER_WIDGET_HOST_VIEW_H_