Changeset 185198 in webkit

Timestamp:

Jun 4, 2015 3:55:31 AM (9 years ago)

Author:

clopez@igalia.com

Message:

[GTK] [Wayland] Build is broken on trunk
​https://bugs.webkit.org/show_bug.cgi?id=142879

Reviewed by Carlos Garcia Campos.

Source/WebCore:

No new tests, no behavior changes.

Patch on GLContext.h picked from bug 136831 by
Iago Toral <​itoral@igalia.com> and Zan Dobersek <​zdobersek@igalia.com>

• platform/graphics/GLContext.h: Include wayland-egl.h before eglplatform.h

to use the Wayland platform when building for Wayland.

• platform/graphics/PlatformDisplay.cpp: Fix the include of GDK

headers for the different targets.

• platform/graphics/wayland/WaylandSurface.cpp: Fix build after r183731.

(WebCore::WaylandSurface::~WaylandSurface):

Source/WebKit2:

• WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:

(WebKit::LayerTreeHostGtk::makeContextCurrent): When Wayland target
is enabled GLNativeWindowType is not an u_int64 type.
Cast contextID to avoid a build failure.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/GLContext.h (modified) (1 diff)
• WebCore/platform/graphics/PlatformDisplay.cpp (modified) (1 diff)
• WebCore/platform/graphics/wayland/WaylandSurface.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-03  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] [Wayland] Build is broken on trunk
+        https://bugs.webkit.org/show_bug.cgi?id=142879
+
+        Reviewed by Carlos Garcia Campos.
+
+        No new tests, no behavior changes.
+
+        Patch on GLContext.h picked from bug 136831 by
+        Iago Toral <itoral@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
+
+        * platform/graphics/GLContext.h: Include wayland-egl.h before eglplatform.h
+        to use the Wayland platform when building for Wayland.
+        * platform/graphics/PlatformDisplay.cpp: Fix the include of GDK
+        headers for the different targets.
+        * platform/graphics/wayland/WaylandSurface.cpp: Fix build after r183731.
+        (WebCore::WaylandSurface::~WaylandSurface):
+
 2015-06-04  Xabier Rodriguez Calvar  <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/platform/graphics/GLContext.h

@@ -27 +27 @@
 #if USE(EGL) && !PLATFORM(GTK)
 #include "eglplatform.h"
+typedef EGLNativeWindowType GLNativeWindowType;
+#elif PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#include <wayland-egl.h>
+#include <EGL/eglplatform.h>
 typedef EGLNativeWindowType GLNativeWindowType;
 #else

trunk/Source/WebCore/platform/graphics/PlatformDisplay.cpp

@@ -43 +43 @@
 
 #if PLATFORM(GTK)
+#if PLATFORM(X11)
 #include <gdk/gdkx.h>
 #endif
+#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2)
+#include <gdk/gdkwayland.h>
+#endif
+#endif // PLATFORM(GTK)
 
 #if PLATFORM(EFL) && defined(HAVE_ECORE_X)

trunk/Source/WebCore/platform/graphics/wayland/WaylandSurface.cpp

@@ -31 +31 @@
 #include "GLContextEGL.h"
 #include "IntSize.h"
-#include "WaylandDisplay.h"
+#include "PlatformDisplayWayland.h"
 #include <EGL/egl.h>
 
@@ -55 +55 @@
 {
     // The surface couldn't have been created in the first place if WaylandDisplay wasn't properly initialized.
-    ASSERT(WaylandDisplay::instance());
-    eglMakeCurrent(WaylandDisplay::instance()->eglDisplay(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    const PlatformDisplayWayland& waylandDisplay = downcast<PlatformDisplayWayland>(PlatformDisplay::sharedDisplay());
+    ASSERT(waylandDisplay.native());
+    eglMakeCurrent(waylandDisplay.native(), EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
 
     wl_egl_window_destroy(m_nativeWindow);

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-03  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [GTK] [Wayland] Build is broken on trunk
+        https://bugs.webkit.org/show_bug.cgi?id=142879
+
+        Reviewed by Carlos Garcia Campos.
+
+        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
+        (WebKit::LayerTreeHostGtk::makeContextCurrent): When Wayland target
+        is enabled GLNativeWindowType is not an u_int64 type.
+        Cast contextID to avoid a build failure.
+
 2015-06-03  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

@@ -85 +85 @@
             return false;
 
-        m_context = GLContext::createContextForWindow(m_layerTreeContext.contextID, GLContext::sharingContext());
+        m_context = GLContext::createContextForWindow(reinterpret_cast<GLNativeWindowType>(m_layerTreeContext.contextID), GLContext::sharingContext());
         if (!m_context)
             return false;