summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/content_browser_client_qt.cpp4
-rw-r--r--src/core/core_gyp_generator.pro2
-rw-r--r--src/core/desktop_screen_qt.cpp113
-rw-r--r--src/core/desktop_screen_qt.h66
-rw-r--r--src/core/render_widget_host_view_qt.cpp5
5 files changed, 187 insertions, 3 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 8945ad0e..200ebd35 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -49,11 +49,13 @@
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/url_constants.h"
+#include "ui/gfx/screen.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_share_group.h"
#include "browser_context_qt.h"
+#include "desktop_screen_qt.h"
#include "dev_tools_http_handler_delegate_qt.h"
#include "media_capture_devices_dispatcher.h"
#include "resource_dispatcher_host_delegate_qt.h"
@@ -186,6 +188,8 @@ public:
int PreCreateThreads() Q_DECL_OVERRIDE
{
base::ThreadRestrictions::SetIOAllowed(true);
+ // Like ChromeBrowserMainExtraPartsAura::PreCreateThreads does.
+ gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, new DesktopScreenQt);
return 0;
}
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index c76c707a..2f58664f 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -40,6 +40,7 @@ SOURCES = \
content_browser_client_qt.cpp \
content_main_delegate_qt.cpp \
delegated_frame_node.cpp \
+ desktop_screen_qt.cpp \
dev_tools_http_handler_delegate_qt.cpp \
download_manager_delegate_qt.cpp \
gl_context_qt.cpp \
@@ -79,6 +80,7 @@ HEADERS = \
content_browser_client_qt.h \
content_main_delegate_qt.h \
delegated_frame_node.h \
+ desktop_screen_qt.h \
dev_tools_http_handler_delegate_qt.h \
download_manager_delegate_qt.h \
chromium_gpu_helper.h \
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
new file mode 100644
index 00000000..bef15a90
--- /dev/null
+++ b/src/core/desktop_screen_qt.cpp
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "desktop_screen_qt.h"
+
+bool DesktopScreenQt::IsDIPEnabled()
+{
+ // Currently only used by GetScaleFactorForNativeView for drag events.
+ // Short-circuit this until we can test any implementation properly in real code.
+ return false;
+}
+
+gfx::Point DesktopScreenQt::GetCursorScreenPoint()
+{
+ Q_UNREACHABLE();
+ return gfx::Point();
+}
+
+gfx::NativeWindow DesktopScreenQt::GetWindowUnderCursor()
+{
+ Q_UNREACHABLE();
+ return gfx::NativeWindow();
+}
+
+gfx::NativeWindow DesktopScreenQt::GetWindowAtScreenPoint(const gfx::Point& point)
+{
+ Q_UNREACHABLE();
+ return gfx::NativeWindow();
+}
+
+int DesktopScreenQt::GetNumDisplays() const
+{
+ Q_UNREACHABLE();
+ return 0;
+}
+
+std::vector<gfx::Display> DesktopScreenQt::GetAllDisplays() const
+{
+ Q_UNREACHABLE();
+ return std::vector<gfx::Display>();
+}
+
+gfx::Display DesktopScreenQt::GetDisplayNearestWindow(gfx::NativeView window) const
+{
+ Q_UNREACHABLE();
+ return gfx::Display();
+}
+
+gfx::Display DesktopScreenQt::GetDisplayNearestPoint(const gfx::Point& point) const
+{
+ Q_UNREACHABLE();
+ return gfx::Display();
+}
+
+gfx::Display DesktopScreenQt::GetDisplayMatching(const gfx::Rect& match_rect) const
+{
+ Q_UNREACHABLE();
+ return gfx::Display();
+}
+
+gfx::Display DesktopScreenQt::GetPrimaryDisplay() const
+{
+ Q_UNREACHABLE();
+ return gfx::Display();
+}
+
+void DesktopScreenQt::AddObserver(gfx::DisplayObserver* observer)
+{
+ Q_UNREACHABLE();
+}
+
+void DesktopScreenQt::RemoveObserver(gfx::DisplayObserver* observer)
+{
+ Q_UNREACHABLE();
+}
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h
new file mode 100644
index 00000000..79eb9c8d
--- /dev/null
+++ b/src/core/desktop_screen_qt.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef DESKTOP_SCREEN_QT_H
+#define DESKTOP_SCREEN_QT_H
+
+#include "ui/gfx/screen.h"
+
+#include <QtGlobal>
+
+class DesktopScreenQt : public gfx::Screen {
+public:
+ // Overridden from gfx::Screen:
+ virtual bool IsDIPEnabled() Q_DECL_OVERRIDE;
+ virtual gfx::Point GetCursorScreenPoint() Q_DECL_OVERRIDE;
+ virtual gfx::NativeWindow GetWindowUnderCursor() Q_DECL_OVERRIDE;
+ virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) Q_DECL_OVERRIDE;
+ virtual int GetNumDisplays() const Q_DECL_OVERRIDE;
+ virtual std::vector<gfx::Display> GetAllDisplays() const Q_DECL_OVERRIDE;
+ virtual gfx::Display GetDisplayNearestWindow(gfx::NativeView window) const Q_DECL_OVERRIDE;
+ virtual gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const Q_DECL_OVERRIDE;
+ virtual gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const Q_DECL_OVERRIDE;
+ virtual gfx::Display GetPrimaryDisplay() const Q_DECL_OVERRIDE;
+ virtual void AddObserver(gfx::DisplayObserver* observer) Q_DECL_OVERRIDE;
+ virtual void RemoveObserver(gfx::DisplayObserver* observer) Q_DECL_OVERRIDE;
+};
+
+#endif // DESKTOP_SCREEN_QT_H
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index f02729cd..44dce630 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -246,9 +246,8 @@ gfx::NativeView RenderWidgetHostViewQt::GetNativeView() const
// pointer (HWND, NSView*, GtkWidget*) and other ports use
// this function in the renderer_host layer when setting up
// the view hierarchy and for generating snapshots in tests.
- // Since we manage the view hierarchy in Qt we can possibly
- // avoid calls to this.
- QT_NOT_USED
+ // Since we manage the view hierarchy in Qt its value hasn't
+ // been meaningful.
return gfx::NativeView();
}