summaryrefslogtreecommitdiffstats
path: root/src/core/chromium_overrides.cpp
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-20 16:05:49 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-28 10:37:20 +0100
commit9a1a09bf82ea98a2b69b351120619c787ce990a8 (patch)
treebcd27019991abde6ede6c0fa8480eab1287d522b /src/core/chromium_overrides.cpp
parentba5efed2905de98ed0c9eff3998c270d92a100de (diff)
Adapt to API changes in new stable branch 1750
Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
-rw-r--r--src/core/chromium_overrides.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp
index be97bc089..b0f8702d0 100644
--- a/src/core/chromium_overrides.cpp
+++ b/src/core/chromium_overrides.cpp
@@ -57,20 +57,20 @@
#include <X11/Xlib.h>
#endif
-void GetScreenInfoFromNativeWindow(QWindow* window, WebKit::WebScreenInfo* results)
+void GetScreenInfoFromNativeWindow(QWindow* window, blink::WebScreenInfo* results)
{
QScreen* screen = window->screen();
- WebKit::WebScreenInfo r;
+ blink::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());
+ r.rect = blink::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());
+ r.availableRect = blink::WebRect(available.x(), available.y(), available.width(), available.height());
*results = r;
}
@@ -111,7 +111,7 @@ RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost
}
// static
-void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebKit::WebScreenInfo* results) {
+void RenderWidgetHostViewPort::GetDefaultScreenInfo(blink::WebScreenInfo* results) {
QWindow dummy;
GetScreenInfoFromNativeWindow(&dummy, results);
}