From f5c3b832341e61f5b3f046b4b7855125b0e0ae99 Mon Sep 17 00:00:00 2001
From: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Date: Mon, 13 Jan 2014 10:59:35 +0100
Subject: [PATCH] Fix RenderWidgetHostViewQt::GetCompositingSurface() on
Windows
gfx::GLSurfaceHandle needs reinterpret_cast for the first parameter
to match an overload.
Change-Id: I4b89c38b9694ab649e1e623049573675c926a4a7
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
src/core/render_widget_host_view_qt.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 15124f9e9..0e85c5857 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -612,7 +612,11 @@ gfx::Rect RenderWidgetHostViewQt::GetBoundsInRootWindow()
gfx::GLSurfaceHandle RenderWidgetHostViewQt::GetCompositingSurface()
{
gfx::NativeViewId nativeViewId = GetNativeViewId();
+#if defined(OS_WIN)
+ return nativeViewId ? gfx::GLSurfaceHandle(reinterpret_cast<gfx::PluginWindowHandle>(nativeViewId), gfx::NATIVE_TRANSPORT) : gfx::GLSurfaceHandle();
+#else
return nativeViewId ? gfx::GLSurfaceHandle(nativeViewId, gfx::NATIVE_TRANSPORT) : gfx::GLSurfaceHandle();
+#endif
}
void RenderWidgetHostViewQt::SetHasHorizontalScrollbar(bool) { }
--
GitLab