Diff
Modified: trunk/ChangeLog (231041 => 231042)
--- trunk/ChangeLog 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/ChangeLog 2018-04-26 06:40:04 UTC (rev 231042)
@@ -1,5 +1,17 @@
2018-04-25 Michael Catanzaro <mcatanz...@igalia.com>
+ [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
+ https://bugs.webkit.org/show_bug.cgi?id=184643
+
+ Reviewed by Žan Doberšek.
+
+ Update find modules to include the API versions.
+
+ * Source/cmake/FindWPEBackend-fdo.cmake:
+ * Source/cmake/FindWPEBackend.cmake:
+
+2018-04-25 Michael Catanzaro <mcatanz...@igalia.com>
+
[CMake] Some options should be marked as advanced
https://bugs.webkit.org/show_bug.cgi?id=184972
Modified: trunk/Source/WebCore/ChangeLog (231041 => 231042)
--- trunk/Source/WebCore/ChangeLog 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebCore/ChangeLog 2018-04-26 06:40:04 UTC (rev 231042)
@@ -1,3 +1,16 @@
+2018-04-25 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
+ https://bugs.webkit.org/show_bug.cgi?id=184643
+
+ Reviewed by Žan Doberšek.
+
+ Adapt to single-header WPE includes.
+
+ * platform/graphics/egl/GLContextEGLWPE.cpp:
+ * platform/graphics/wpe/PlatformDisplayWPE.cpp:
+ * platform/wpe/PlatformPasteboardWPE.cpp:
+
2018-04-25 Youenn Fablet <you...@apple.com>
Use NetworkLoadChecker for all subresource loads except fetch/XHR
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp (231041 => 231042)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -26,7 +26,7 @@
// somehow deducible from the build configuration.
#define __GBM__ 1
#include "EpoxyEGL.h"
-#include <wpe/renderer-backend-egl.h>
+#include <wpe/wpe-egl.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp (231041 => 231042)
--- trunk/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -33,7 +33,7 @@
// somehow deducible from the build configuration.
#define __GBM__ 1
#include "EpoxyEGL.h"
-#include <wpe/renderer-backend-egl.h>
+#include <wpe/wpe-egl.h>
namespace WebCore {
Modified: trunk/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp (231041 => 231042)
--- trunk/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -27,7 +27,7 @@
#include "PlatformPasteboard.h"
#include "Pasteboard.h"
-#include <wpe/pasteboard.h>
+#include <wpe/wpe.h>
#include <wtf/Assertions.h>
#include <wtf/text/WTFString.h>
Modified: trunk/Source/WebKit/ChangeLog (231041 => 231042)
--- trunk/Source/WebKit/ChangeLog 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/ChangeLog 2018-04-26 06:40:04 UTC (rev 231042)
@@ -1,3 +1,26 @@
+2018-04-25 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
+ https://bugs.webkit.org/show_bug.cgi?id=184643
+
+ Reviewed by Žan Doberšek.
+
+ Adapt to single-header WPE includes.
+
+ Null-initialize padding to silence -Wmissing-field-initializers. (Yuck.)
+
+ * Shared/NativeWebTouchEvent.h:
+ * Shared/wpe/WebEventFactory.cpp:
+ * UIProcess/API/glib/WebKitPrivate.cpp:
+ * UIProcess/API/wpe/CompositingManagerProxy.cpp:
+ * UIProcess/API/wpe/ScrollGestureController.h:
+ * UIProcess/API/wpe/WPEView.cpp:
+ (WKWPE::m_backend):
+ * UIProcess/API/wpe/WebKitWebViewBackend.h:
+ * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
+ * WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp:
+ (WebKit::AcceleratedSurfaceWPE::initialize):
+
2018-04-25 Saam Barati <sbar...@apple.com>
dlopen the bundle's executable before calling -[NSBundle load] since that will also do a bunch of other things we don't need
Modified: trunk/Source/WebKit/Shared/NativeWebTouchEvent.h (231041 => 231042)
--- trunk/Source/WebKit/Shared/NativeWebTouchEvent.h 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/Shared/NativeWebTouchEvent.h 2018-04-26 06:40:04 UTC (rev 231042)
@@ -35,7 +35,7 @@
#elif PLATFORM(GTK)
#include <WebCore/GUniquePtrGtk.h>
#elif PLATFORM(WPE)
-#include <wpe/input.h>
+#include <wpe/wpe.h>
#endif
namespace WebKit {
Modified: trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp (231041 => 231042)
--- trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/Shared/wpe/WebEventFactory.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -28,7 +28,7 @@
#include <WebCore/Scrollbar.h>
#include <cmath>
-#include <wpe/input.h>
+#include <wpe/wpe.h>
#include <wtf/glib/GUniquePtr.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -27,7 +27,7 @@
#if PLATFORM(GTK)
#include <gdk/gdk.h>
#elif PLATFORM(WPE)
-#include <wpe/input.h>
+#include <wpe/wpe.h>
#endif
#if PLATFORM(GTK)
Modified: trunk/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -31,7 +31,7 @@
#include "WPEView.h"
#include "WebProcessPool.h"
#include "WebProcessProxy.h"
-#include <wpe/view-backend.h>
+#include <wpe/wpe.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h 2018-04-26 06:40:04 UTC (rev 231042)
@@ -25,7 +25,7 @@
#pragma once
-#include <wpe/input.h>
+#include <wpe/wpe.h>
namespace WebKit {
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -35,7 +35,7 @@
#include "NativeWebWheelEvent.h"
#include "WebPageGroup.h"
#include "WebProcessPool.h"
-#include <wpe/view-backend.h>
+#include <wpe/wpe.h>
using namespace WebKit;
@@ -87,7 +87,12 @@
{
auto& view = *reinterpret_cast<View*>(data);
view.frameDisplayed();
- }
+ },
+ // padding
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr
};
wpe_view_backend_set_backend_client(m_backend, &s_backendClient, this);
@@ -124,6 +129,11 @@
auto& page = reinterpret_cast<View*>(data)->page();
page.handleTouchEvent(WebKit::NativeWebTouchEvent(event, page.deviceScaleFactor()));
},
+ // padding
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr
};
wpe_view_backend_set_input_client(m_backend, &s_inputClient, this);
Modified: trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h 2018-04-26 06:40:04 UTC (rev 231042)
@@ -26,7 +26,7 @@
#include <glib-object.h>
#include <wpe/WebKitDefines.h>
-#include <wpe/view-backend.h>
+#include <wpe/wpe.h>
G_BEGIN_DECLS
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp (231041 => 231042)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -41,7 +41,7 @@
#include <wtf/text/WTFString.h>
#if PLATFORM(WPE)
-#include <wpe/renderer-host.h>
+#include <wpe/wpe.h>
#endif
namespace WebKit {
Modified: trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp (231041 => 231042)
--- trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -28,7 +28,7 @@
#include "WebPage.h"
#include <WebCore/PlatformDisplayWPE.h>
-#include <wpe/renderer-backend-egl.h>
+#include <wpe/wpe-egl.h>
using namespace WebCore;
@@ -60,6 +60,11 @@
auto& surface = *reinterpret_cast<AcceleratedSurfaceWPE*>(data);
surface.m_client.frameComplete();
},
+ // padding
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr
};
wpe_renderer_backend_egl_target_set_client(m_backend, &s_client, this);
wpe_renderer_backend_egl_target_initialize(m_backend, downcast<PlatformDisplayWPE>(PlatformDisplay::sharedDisplay()).backend(),
Modified: trunk/Source/cmake/FindWPEBackend-fdo.cmake (231041 => 231042)
--- trunk/Source/cmake/FindWPEBackend-fdo.cmake 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/cmake/FindWPEBackend-fdo.cmake 2018-04-26 06:40:04 UTC (rev 231042)
@@ -29,15 +29,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo)
+pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo-0.1)
find_path(WPEBACKEND_FDO_INCLUDE_DIRS
- NAMES wpe-fdo/initialize-egl.h
+ NAMES wpe/fdo.h
HINTS ${PC_WPEBACKEND_FDO_INCLUDEDIR} ${PC_WPEBACKEND_FDO_INCLUDE_DIRS}
)
find_library(WPEBACKEND_FDO_LIBRARIES
- NAMES WPEBackend-fdo
+ NAMES WPEBackend-fdo-0.1
HINTS ${PC_WPEBACKEND_FDO_LIBDIR} ${PC_WPEBACKEND_FDO_LIBRARY_DIRS}
)
Modified: trunk/Source/cmake/FindWPEBackend.cmake (231041 => 231042)
--- trunk/Source/cmake/FindWPEBackend.cmake 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Source/cmake/FindWPEBackend.cmake 2018-04-26 06:40:04 UTC (rev 231042)
@@ -29,15 +29,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(PC_WPE QUIET wpe)
+pkg_check_modules(PC_WPE QUIET wpe-0.1)
find_path(WPE_INCLUDE_DIRS
- NAMES wpe/loader.h
+ NAMES wpe/wpe.h
HINTS ${PC_WPE_INCLUDEDIR} ${PC_WPE_INCLUDE_DIRS}
)
find_library(WPE_LIBRARIES
- NAMES WPEBackend
+ NAMES WPEBackend-0.1
HINTS ${PC_WPE_LIBDIR} ${PC_WPE_LIBRARY_DIRS}
)
Modified: trunk/Tools/ChangeLog (231041 => 231042)
--- trunk/Tools/ChangeLog 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/ChangeLog 2018-04-26 06:40:04 UTC (rev 231042)
@@ -1,3 +1,28 @@
+2018-04-25 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
+ https://bugs.webkit.org/show_bug.cgi?id=184643
+
+ Reviewed by Žan Doberšek.
+
+ Add missing INCLUDE_DIRS in many places.
+
+ Adapt to single-header WPE includes.
+
+ Null-initialize padding to silence -Wmissing-field-initializers. (Yuck.)
+
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp:
+ (testWebViewWebBackend):
+ * TestWebKitAPI/glib/PlatformWPE.cmake:
+ * WebKitTestRunner/EventSenderProxy.h:
+ * WebKitTestRunner/PlatformWPE.cmake:
+ * WebKitTestRunner/wpe/EventSenderProxyWPE.cpp:
+ * wpe/HeadlessViewBackend/CMakeLists.txt:
+ * wpe/HeadlessViewBackend/HeadlessViewBackend.cpp:
+ * wpe/HeadlessViewBackend/HeadlessViewBackend.h:
+ * wpe/jhbuild.modules:
+
2018-04-25 Jonathan Bedard <jbed...@apple.com>
REGRESSION (r230998): Bot watcher's dashboard doesn't display number of API test failures
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (231041 => 231042)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-04-26 06:40:04 UTC (rev 231042)
@@ -24,6 +24,8 @@
${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
+ ${WPE_INCLUDE_DIRS}
+ ${WPEBACKEND_FDO_INCLUDE_DIRS}
)
set(test_main_SOURCES
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp (231041 => 231042)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -116,7 +116,12 @@
// initialize
[](void*) { },
// get_renderer_host_fd
- [](void*) -> int { return -1; }
+ [](void*) -> int { return -1; },
+ // padding
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr
};
// User provided backend with default deleter (we don't have a way to check the backend will be actually freed).
Modified: trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake (231041 => 231042)
--- trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/TestWebKitAPI/glib/PlatformWPE.cmake 2018-04-26 06:40:04 UTC (rev 231042)
@@ -15,9 +15,11 @@
list(APPEND WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
${WPE_INCLUDE_DIRS}
+ ${WPEBACKEND_FDO_INCLUDE_DIRS}
)
list(APPEND WebKitGLibAPITest_LIBRARIES
${WPE_LIBRARIES}
+ ${WPEBACKEND_FDO_LIBRARIES}
WPEHeadlessViewBackend
)
Modified: trunk/Tools/WebKitTestRunner/EventSenderProxy.h (231041 => 231042)
--- trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/WebKitTestRunner/EventSenderProxy.h 2018-04-26 06:40:04 UTC (rev 231042)
@@ -29,6 +29,7 @@
#include <wtf/Deque.h>
#include <wtf/HashMap.h>
+#include <wtf/HashSet.h>
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
@@ -35,12 +36,10 @@
#if PLATFORM(GTK)
#include <WebCore/GUniquePtrGtk.h>
#include <gdk/gdk.h>
-#include <wtf/HashSet.h>
#endif
#if PLATFORM(WPE)
-#include <wpe/input.h>
-#include <wtf/HashSet.h>
+#include <wpe/wpe.h>
#endif
#if PLATFORM(COCOA)
Modified: trunk/Tools/WebKitTestRunner/PlatformWPE.cmake (231041 => 231042)
--- trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2018-04-26 06:40:04 UTC (rev 231042)
@@ -1,4 +1,5 @@
find_package(Libxkbcommon 0.4.0 REQUIRED)
+find_package(WPEBackend-fdo REQUIRED)
add_custom_target(WebKitTestRunner-forwarding-headers
COMMAND ${PERL_EXECUTABLE} ${WEBKIT_DIR}/Scripts/generate-forwarding-headers.pl --include-path ${WEBKIT_TESTRUNNER_DIR} --output ${FORWARDING_HEADERS_DIR} --platform wpe
@@ -25,6 +26,7 @@
${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBXKBCOMMON_INCLUDE_DIRS}
+ ${WPEBACKEND_FDO_INCLUDE_DIRS}
)
list(APPEND WebKitTestRunner_LIBRARIES
@@ -31,6 +33,7 @@
${CAIRO_LIBRARIES}
${GLIB_LIBRARIES}
${LIBXKBCOMMON_LIBRARIES}
+ ${WPEBACKEND_FDO_LIBRARIES}
WPEHeadlessViewBackend
)
Modified: trunk/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp (231041 => 231042)
--- trunk/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -30,7 +30,7 @@
#include "PlatformWebView.h"
#include "TestController.h"
#include <WebCore/NotImplemented.h>
-#include <wpe/view-backend.h>
+#include <wpe/wpe.h>
#include <xkbcommon/xkbcommon-keysyms.h>
#include <xkbcommon/xkbcommon.h>
Modified: trunk/Tools/wpe/HeadlessViewBackend/CMakeLists.txt (231041 => 231042)
--- trunk/Tools/wpe/HeadlessViewBackend/CMakeLists.txt 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/wpe/HeadlessViewBackend/CMakeLists.txt 2018-04-26 06:40:04 UTC (rev 231042)
@@ -7,6 +7,7 @@
set(WPEHeadlessViewBackend_SYSTEM_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
+ ${WPE_INCLUDE_DIRS}
${WPEBACKEND_FDO_INCLUDE_DIRS}
)
@@ -13,6 +14,7 @@
set(WPEHeadlessViewBackend_LIBRARIES
${CAIRO_LIBRARIES}
${GLIB_LIBRARIES}
+ ${WPE_LIBRARIES}
${WPEBACKEND_FDO_LIBRARIES}
)
Modified: trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp (231041 => 231042)
--- trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp 2018-04-26 06:40:04 UTC (rev 231042)
@@ -28,7 +28,7 @@
#include <cassert>
#include <fcntl.h>
#include <unistd.h>
-#include <wpe-fdo/initialize-egl.h>
+#include <wpe/fdo-egl.h>
// Manually provide the EGL_CAST C++ definition in case eglplatform.h doesn't provide it.
#ifndef EGL_CAST
@@ -232,4 +232,9 @@
EGLImageKHR image = egl.createImage(egl.display, EGL_NO_CONTEXT, EGL_WAYLAND_BUFFER_WL, bufferResource, attributes);
backend.m_pendingImage = { bufferResource, std::make_tuple(image, width, height) };
},
+ // padding
+ nullptr,
+ nullptr,
+ nullptr,
+ nullptr
};
Modified: trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h (231041 => 231042)
--- trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h 2018-04-26 06:40:04 UTC (rev 231042)
@@ -32,7 +32,7 @@
#include <cairo.h>
#include <glib.h>
#include <unordered_map>
-#include <wpe-fdo/view-backend-exportable.h>
+#include <wpe/fdo.h>
#ifndef EGL_WL_bind_wayland_display
#define EGL_WL_bind_wayland_display 1
Modified: trunk/Tools/wpe/jhbuild.modules (231041 => 231042)
--- trunk/Tools/wpe/jhbuild.modules 2018-04-26 03:33:58 UTC (rev 231041)
+++ trunk/Tools/wpe/jhbuild.modules 2018-04-26 06:40:04 UTC (rev 231042)
@@ -164,7 +164,7 @@
<cmake id="wpebackend">
<branch repo="github.com" module="WebPlatformForEmbedded/WPEBackend.git"
- tag="3013faaebab42e7ef7497b3850a2902978eb3d6f" />
+ tag="761496dff51b6962200294b4fe2bc9529da731a8" />
</cmake>
<cmake id="wpebackend-fdo">
@@ -173,7 +173,7 @@
<dep package="glib"/>
</dependencies>
<branch repo="github.com" module="Igalia/WPEBackend-fdo.git"
- tag="064c60806422ff1bb32cef7fb1de68923aecba82"/>
+ tag="bdd46870b1dc3c92005343e3161bdd24f620b11d"/>
</cmake>
<autotools id="libgpg-error" autogen-sh="configure">
@@ -202,7 +202,7 @@
</autotools>
<autotools id="dyz" supports-non-srcdir-builds="no">
- <branch repo="github.com" module="Igalia/dyz" tag="74a368cc63a0ff9bba675182affa3a3fd13aad80"/>
+ <branch repo="github.com" module="Igalia/dyz" tag="4f196778c82ed72095e72c9d401cd2ff8ba36c60"/>
</autotools>
<meson id="graphene">
