summaryrefslogtreecommitdiff
path: root/lib/chromium_overrides.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2013-11-19 17:55:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-28 16:15:59 +0100
commitfd61d752e313bf91a09c85020b3fb50067c610c8 (patch)
tree5aeff0a1039acc3e7bf7ced21870cac42d491f9e /lib/chromium_overrides.cpp
parent84a400e80d7e40aba2853411fdfb22f244c3e728 (diff)
downloadqtwebengine-fd61d752e313bf91a09c85020b3fb50067c610c8.tar.gz
Moving sources to src part 1: Move files.
This only move files without adjusting any paths. This moves: - lib/quick -> src/webengine/api (API files) lib/quick -> src/webengine (other files) This contains the main QtWebEngine module library since <ec7b2ee70a8b2db7fb87f50671a001ddd54697b0>. - lib/widgets -> src/webenginewidgets Also rename this directory to match its module name and rename Api to api. - lib -> src/core - process -> src/process - resources -> src/core/resources - tools/* -> tools/scripts/ The build directory is spread as follow: - build/build.pro -> src/core/gyp_run.pro - build/qmake_extras/* -> src/core/ (for the host and target .pro files) - build/qmake -> tools/qmake - Build related scripts -> tools/buildscripts Change-Id: I0cded1de772c99c0c1da6536c9afea353236b4a1 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'lib/chromium_overrides.cpp')
-rw-r--r--lib/chromium_overrides.cpp115
1 files changed, 0 insertions, 115 deletions
diff --git a/lib/chromium_overrides.cpp b/lib/chromium_overrides.cpp
deleted file mode 100644
index 383fc6587..000000000
--- a/lib/chromium_overrides.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 "chromium_overrides.h"
-
-#include "base/message_loop/message_pump_gtk.h"
-#include "content/browser/renderer_host/render_widget_host_view_base.h"
-
-#include <QGuiApplication>
-#include <QScreen>
-#include <QWindow>
-#include <qpa/qplatformnativeinterface.h>
-
-#if defined(USE_X11)
-#include <X11/Xlib.h>
-#endif
-
-void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results)
-{
- QScreen* screen = window->screen();
-
- WebKit::WebScreenInfo r;
- r.deviceScaleFactor = screen->devicePixelRatio();
- r.depthPerComponent = 8;
- r.depth = screen->depth();
- r.isMonochrome = (r.depth == 1);
-
- QRect screenGeometry = screen->geometry();
- r.rect = WebKit::WebRect(screenGeometry.x(), screenGeometry.y(), screenGeometry.width(), screenGeometry.height());
- QRect available = screen->availableGeometry();
- r.availableRect = WebKit::WebRect(available.x(), available.y(), available.width(), available.height());
- *results = r;
-}
-
-namespace base {
-
-#if defined(USE_X11)
-Display* MessagePumpGtk::GetDefaultXDisplay() {
- static void *display = qApp->platformNativeInterface()->nativeResourceForScreen(QByteArrayLiteral("display"), qApp->primaryScreen());
- if (!display) {
- // XLib isn't available or has not been initialized, which is a decision we wish to
- // support, for example for the GPU process.
- static Display* xdisplay = XOpenDisplay(NULL);
- return xdisplay;
- }
- return static_cast<Display*>(display);
-}
-#endif
-
-}
-
-namespace content {
-class WebContentsImpl;
-class WebContentsViewPort;
-class WebContentsViewDelegate;
-class RenderViewHostDelegateView;
-
-WebContentsViewPort* CreateWebContentsView(WebContentsImpl*,
- WebContentsViewDelegate*,
- RenderViewHostDelegateView**)
-{
- return 0;
-}
-
-RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost*) {
- // WebContentsViewQt should take care of this directly.
- Q_UNREACHABLE();
- return NULL;
-}
-
-// static
-void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebKit::WebScreenInfo* results) {
- QWindow dummy;
- GetScreenInfoFromNativeWindow(&dummy, results);
-}
-
-}