Attachment 338794 Details for Bug 184643 – Patch

[patch] Patch

bug-184643-20180425162805.patch (text/plain), 20.26 KB, created by Michael Catanzaro on 2018-04-25 14:28:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-04-25 14:28:06 PDT

Size: 20.26 KB

patch

obsolete

>Subversion Revision: 231014
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d4d3cabfd7adc69f98bb4af1f21a05a7eb1c25d3..d534a7bad3e21bcd785602362c5b498817990279 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
>+        https://bugs.webkit.org/show_bug.cgi?id=184643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Adapt to single-header WPE includes.
>+
>+        * platform/graphics/egl/GLContextEGLWPE.cpp:
>+        * platform/graphics/wpe/PlatformDisplayWPE.cpp:
>+        * platform/wpe/PlatformPasteboardWPE.cpp:
>+
> 2018-04-25  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Implement Layout::Container functions.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8df44d7843f190a8c92fbed89d6744f727cb01f8..5aa1baa62a0cc3987e3ff0c61642247bfbf59071 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
>+        https://bugs.webkit.org/show_bug.cgi?id=184643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Fix entitlements and sandbox configurations in WebKit after r230778
>diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp
>index c049e19801466a50dbd82e2126cadcb1be9602bc..bc69ea5494ea7402cb77a0cd73b31dc3373b0115 100644
>--- a/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp
>+++ b/Source/WebCore/platform/graphics/egl/GLContextEGLWPE.cpp
>@@ -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 {
> 
>diff --git a/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp b/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp
>index 0a94ee5c96fb32fda7b2b53c04575b37496d103e..e840ce0ec1df97e442405cd42ea704a25d56640a 100644
>--- a/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp
>+++ b/Source/WebCore/platform/graphics/wpe/PlatformDisplayWPE.cpp
>@@ -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 {
> 
>diff --git a/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp b/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp
>index 0c2440b5ffb357196d266a071016d90d4f7232e8..4a26222de6fc4b9b2d4c274dff753c193493b89f 100644
>--- a/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp
>+++ b/Source/WebCore/platform/wpe/PlatformPasteboardWPE.cpp
>@@ -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>
> 
>diff --git a/Source/WebKit/Shared/NativeWebTouchEvent.h b/Source/WebKit/Shared/NativeWebTouchEvent.h
>index ac26ae169c6f9f5c84825a562bbbcc8544cb00c3..4d93c6944590b9219c3754fbec43fe702378e0e1 100644
>--- a/Source/WebKit/Shared/NativeWebTouchEvent.h
>+++ b/Source/WebKit/Shared/NativeWebTouchEvent.h
>@@ -35,7 +35,7 @@ struct _UIWebTouchEvent;
> #elif PLATFORM(GTK)
> #include <WebCore/GUniquePtrGtk.h>
> #elif PLATFORM(WPE)
>-#include <wpe/input.h>
>+#include <wpe/wpe.h>
> #endif
> 
> namespace WebKit {
>diff --git a/Source/WebKit/Shared/wpe/WebEventFactory.cpp b/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>index 19358994058826d28dbf89950793f76942260218..7ceaf6697b24b069dbcf96bc481b300d4be1fcfe 100644
>--- a/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>+++ b/Source/WebKit/Shared/wpe/WebEventFactory.cpp
>@@ -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 {
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp b/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp
>index f251a71e3fdcc33d58e25cc6bcd115a92a101cf6..159620ad989b410749a53413b31cd396cebd8ae7 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitPrivate.cpp
>@@ -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)
>diff --git a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp b/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp
>index 09e82dc6774a5838f04337baf146bf6f8fd9badd..f15547dd8c0383cd9e065faa11e326ef48742dd2 100644
>--- a/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/CompositingManagerProxy.cpp
>@@ -31,7 +31,7 @@
> #include "WPEView.h"
> #include "WebProcessPool.h"
> #include "WebProcessProxy.h"
>-#include <wpe/view-backend.h>
>+#include <wpe/wpe.h>
> 
> namespace WebKit {
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h b/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h
>index 664e443c506f81185a00ed622fbf617f8132268d..9c9f6e9e3b18b42f53f72f8eb55a4e6755db47a2 100644
>--- a/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h
>+++ b/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h
>@@ -25,7 +25,7 @@
> 
> #pragma once
> 
>-#include <wpe/input.h>
>+#include <wpe/wpe.h>
> 
> namespace WebKit {
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>index 3e5ddc4fd9557c78deb11a3540404c80e2612c9e..48d8044135fd3ccfee1f691de8208466f3ca87a5 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>+++ b/Source/WebKit/UIProcess/API/wpe/WPEView.cpp
>@@ -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 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
>         {
>             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 @@ View::View(struct wpe_view_backend* backend, const API::PageConfiguration& baseC
>             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);
> 
>diff --git a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
>index 8a7708bc1922c71e331589020e726c152e261100..6663964d5abac79e123d90e0351590884c66aa72 100644
>--- a/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
>+++ b/Source/WebKit/UIProcess/API/wpe/WebKitWebViewBackend.h
>@@ -26,7 +26,7 @@
> 
> #include <glib-object.h>
> #include <wpe/WebKitDefines.h>
>-#include <wpe/view-backend.h>
>+#include <wpe/wpe.h>
> 
> G_BEGIN_DECLS
> 
>diff --git a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>index b797aeee3c1c3874ad990fac5dfafc3d9ab031e1..bebf0f7897fcfdcd8d11a76b283ea7b8a9590d91 100644
>--- a/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>+++ b/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp
>@@ -41,7 +41,7 @@
> #include <wtf/text/WTFString.h>
> 
> #if PLATFORM(WPE)
>-#include <wpe/renderer-host.h>
>+#include <wpe/wpe.h>
> #endif
> 
> namespace WebKit {
>diff --git a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>index f0e6521a5f100be05443ce22a70c72602ec76a42..686e8070abc9fec63f27e1aec5b4815b4c89139c 100644
>--- a/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>+++ b/Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp
>@@ -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 @@ void AcceleratedSurfaceWPE::initialize()
>             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(),
>diff --git a/Source/cmake/FindWPEBackend-fdo.cmake b/Source/cmake/FindWPEBackend-fdo.cmake
>index 979deb4e3a3b1e7b9bb504e429890f52cc6291aa..2b63ad8583a49b2915af4cc3476b4d18c0a9c969 100644
>--- a/Source/cmake/FindWPEBackend-fdo.cmake
>+++ b/Source/cmake/FindWPEBackend-fdo.cmake
>@@ -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}
> )
> 
>diff --git a/Source/cmake/FindWPEBackend.cmake b/Source/cmake/FindWPEBackend.cmake
>index 8b5cff09a66c8440c65b172269a415d295f40ad5..adef136cf238a5bc2b6a1908af5e9e4dd4381d39 100644
>--- a/Source/cmake/FindWPEBackend.cmake
>+++ b/Source/cmake/FindWPEBackend.cmake
>@@ -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}
> )
> 
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index bb5f3ef996e3f11b78a4226c62dc507db5da5b38..e9f5ea25ece8662a1c4fba5b175a8db7d9ad43c1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,28 @@
>+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
>+        https://bugs.webkit.org/show_bug.cgi?id=184643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE] Remove deprecated functions and properties from the API
>diff --git a/Tools/TestWebKitAPI/PlatformWPE.cmake b/Tools/TestWebKitAPI/PlatformWPE.cmake
>index 85cdf0f994d39457e11e34b50b34c8d6a24e7422..366255e8cbc1cb67a5e1cb67d7ef97ad14475f69 100644
>--- a/Tools/TestWebKitAPI/PlatformWPE.cmake
>+++ b/Tools/TestWebKitAPI/PlatformWPE.cmake
>@@ -24,6 +24,8 @@ include_directories(SYSTEM
>     ${CAIRO_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${LIBSOUP_INCLUDE_DIRS}
>+    ${WPE_INCLUDE_DIRS}
>+    ${WPEBACKEND_FDO_INCLUDE_DIRS}
> )
> 
> set(test_main_SOURCES
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>index d3e9bc377cb324b152ab522b992a846ffa9e54f8..823c0adf4a5fd2d6627e72ba87f2784e0757f6d1 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>+++ b/Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp
>@@ -116,7 +116,12 @@ static void testWebViewWebBackend(Test* test, gconstpointer)
>         // 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).
>diff --git a/Tools/TestWebKitAPI/glib/PlatformWPE.cmake b/Tools/TestWebKitAPI/glib/PlatformWPE.cmake
>index aff3b34f5ff70a735eea88613ca9f4f148d5c8a4..c102b1a5a37eeee8fb783c851212f0f099c54842 100644
>--- a/Tools/TestWebKitAPI/glib/PlatformWPE.cmake
>+++ b/Tools/TestWebKitAPI/glib/PlatformWPE.cmake
>@@ -15,9 +15,11 @@ list(APPEND WebKitGLibAPITests_INCLUDE_DIRECTORIES
> 
> list(APPEND WebKitGLibAPITests_SYSTEM_INCLUDE_DIRECTORIES
>     ${WPE_INCLUDE_DIRS}
>+    ${WPEBACKEND_FDO_INCLUDE_DIRS}
> )
> 
> list(APPEND WebKitGLibAPITest_LIBRARIES
>     ${WPE_LIBRARIES}
>+    ${WPEBACKEND_FDO_LIBRARIES}
>     WPEHeadlessViewBackend
> )
>diff --git a/Tools/WebKitTestRunner/EventSenderProxy.h b/Tools/WebKitTestRunner/EventSenderProxy.h
>index 665e7ad093449493f88e242f790fd220c0bb6865..f6e34e46ba3a509a9f9cf51b94eae5bb8d89f773 100644
>--- a/Tools/WebKitTestRunner/EventSenderProxy.h
>+++ b/Tools/WebKitTestRunner/EventSenderProxy.h
>@@ -29,18 +29,17 @@
> 
> #include <wtf/Deque.h>
> #include <wtf/HashMap.h>
>+#include <wtf/HashSet.h>
> #include <wtf/RetainPtr.h>
> #include <wtf/Vector.h>
> 
> #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)
>diff --git a/Tools/WebKitTestRunner/PlatformWPE.cmake b/Tools/WebKitTestRunner/PlatformWPE.cmake
>index 1cd1f28615462a597a4bf452d8993e7150ff903d..89faeded44d66005e7d26fd6cf50f0ee5332a391 100644
>--- a/Tools/WebKitTestRunner/PlatformWPE.cmake
>+++ b/Tools/WebKitTestRunner/PlatformWPE.cmake
>@@ -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,12 +26,14 @@ list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
>     ${CAIRO_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>     ${LIBXKBCOMMON_INCLUDE_DIRS}
>+    ${WPEBACKEND_FDO_INCLUDE_DIRS}
> )
> 
> list(APPEND WebKitTestRunner_LIBRARIES
>     ${CAIRO_LIBRARIES}
>     ${GLIB_LIBRARIES}
>     ${LIBXKBCOMMON_LIBRARIES}
>+    ${WPEBACKEND_FDO_LIBRARIES}
>     WPEHeadlessViewBackend
> )
> 
>diff --git a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>index c2c8be18de68b5d2c80523d00812ca3f18f9bae5..aab11e75515408553b7cebe1cfb3e615d4c43c6e 100644
>--- a/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>+++ b/Tools/WebKitTestRunner/wpe/EventSenderProxyWPE.cpp
>@@ -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>
> 
>diff --git a/Tools/wpe/HeadlessViewBackend/CMakeLists.txt b/Tools/wpe/HeadlessViewBackend/CMakeLists.txt
>index 4f7f9a40165d88f7dde9a7eddc09f220739c9455..13dbd42299945c6aef8170f58cc061bffe6b269c 100644
>--- a/Tools/wpe/HeadlessViewBackend/CMakeLists.txt
>+++ b/Tools/wpe/HeadlessViewBackend/CMakeLists.txt
>@@ -7,12 +7,14 @@ set(WPEHeadlessViewBackend_SOURCES
> set(WPEHeadlessViewBackend_SYSTEM_INCLUDE_DIRECTORIES
>     ${CAIRO_INCLUDE_DIRS}
>     ${GLIB_INCLUDE_DIRS}
>+    ${WPE_INCLUDE_DIRS}
>     ${WPEBACKEND_FDO_INCLUDE_DIRS}
> )
> 
> set(WPEHeadlessViewBackend_LIBRARIES
>     ${CAIRO_LIBRARIES}
>     ${GLIB_LIBRARIES}
>+    ${WPE_LIBRARIES}
>     ${WPEBACKEND_FDO_LIBRARIES}
> )
> 
>diff --git a/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp b/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp
>index 3be138142a84c6248ad3ec369050949ce8e59c0a..1a6b79957224383dec93c777bbe252861d1200ce 100644
>--- a/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp
>+++ b/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.cpp
>@@ -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 @@ struct wpe_view_backend_exportable_fdo_client HeadlessViewBackend::s_exportableC
>         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
> };
>diff --git a/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h b/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h
>index b5610b7f597c292f6dc9d47af98beff80060a6d4..e142e69d8345250ef5fb9c1ee48bb5c750f24eea 100644
>--- a/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h
>+++ b/Tools/wpe/HeadlessViewBackend/HeadlessViewBackend.h
>@@ -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
>diff --git a/Tools/wpe/jhbuild.modules b/Tools/wpe/jhbuild.modules
>index 1556b8de3a2a4fed693adcaa8e437391a3e5fe92..c3766f7837d893fd0a44dd8a50bad89ac75f6b39 100644
>--- a/Tools/wpe/jhbuild.modules
>+++ b/Tools/wpe/jhbuild.modules
>@@ -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">
>diff --git a/ChangeLog b/ChangeLog
>index 57222c71f545ccb7d7993cef989e93ae0a8192b0..16c69bde0cc75d0ec21b69e20d28430e12197643 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE] Build and link against latest WPEBackend and WPEBackend-fdo
>+        https://bugs.webkit.org/show_bug.cgi?id=184643
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Update find modules to include the API versions.
>+
>+        * Source/cmake/FindWPEBackend-fdo.cmake:
>+        * Source/cmake/FindWPEBackend.cmake:
>+
> 2018-04-25  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [CMake] Some options should be marked as advanced

Actions: View | Formatted Diff | Diff

Attachments on bug 184643: 337990 | 338709 | 338727 | 338728 | 338731 | 338736 | 338738 | 338780 | 338794