Diff
Modified: releases/WebKitGTK/webkit-2.24/ChangeLog (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/ChangeLog 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/ChangeLog 2019-02-27 22:59:13 UTC (rev 242163)
@@ -1,3 +1,13 @@
+2019-02-25 Adrian Perez de Castro <ape...@igalia.com>
+
+ [WPE] Bump WPEBackend-fdo requirement to API version 1.0
+ https://bugs.webkit.org/show_bug.cgi?id=195001
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/FindWPEBackend-fdo.cmake: Use WPEBackend-fdo-1.0.
+ * Source/cmake/OptionsWPE.cmake: Ditto.
+
2019-02-21 Adrian Perez de Castro <ape...@igalia.com>
Unreviewed. Update OptionsWPE.cmake and NEWS for 2.23.90 release
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-02-27 22:59:13 UTC (rev 242163)
@@ -1,3 +1,26 @@
+2019-02-25 Adrian Perez de Castro <ape...@igalia.com>
+
+ [WPE] Bump WPEBackend-fdo requirement to API version 1.0
+ https://bugs.webkit.org/show_bug.cgi?id=195001
+
+ Reviewed by Carlos Garcia Campos.
+
+ API version 1.0 always includes the functionality previously guarded with
+ WPE_BACKEND_CHECK_VERSION(): remove the guards and always use the new functions
+ unconditionally.
+
+ * UIProcess/API/wpe/WPEView.cpp:
+ (WKWPE::View::View): Remove usage of WPE_BACKEND_CHECK_VERSION().
+ (WKWPE::m_backend): Ditto.
+ * UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
+ (WPEQtViewBackend::WPEQtViewBackend): Use libWPEBackend-fdo-1.0 as
+ library name, remove call to wpe_fdo_initialize_for_egl_display().
+ (WPEQtViewBackend::create): Call wpe_fdo_initialize_for_egl_display()
+ here, to bail out early in case initialization fails.
+ * UIProcess/glib/WebProcessPoolGLib.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Remove usage of
+ WPE_BACKEND_CHECK_VERSION().
+
2019-02-21 Adrian Perez de Castro <ape...@igalia.com>
[WPE][GTK] No API documentation generated for WebKitUserContentFilterStore
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/WPEView.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/WPEView.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -45,9 +45,7 @@
: m_client(std::make_unique<API::ViewClient>())
, m_pageClient(std::make_unique<PageClientImpl>(*this))
, m_size { 800, 600 }
-#if !defined(WPE_BACKEND_CHECK_VERSION) || !WPE_BACKEND_CHECK_VERSION(1, 1, 0)
, m_viewStateFlags { WebCore::ActivityState::WindowIsActive, WebCore::ActivityState::IsFocused, WebCore::ActivityState::IsVisible, WebCore::ActivityState::IsInWindow }
-#endif
, m_backend(backend)
{
ASSERT(m_backend);
@@ -87,7 +85,6 @@
auto& view = *reinterpret_cast<View*>(data);
view.frameDisplayed();
},
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
// activity_state_changed
[](void* data, uint32_t state)
{
@@ -103,9 +100,6 @@
flags.add(WebCore::ActivityState::IsInWindow);
view.setViewState(flags);
},
-#else
- nullptr,
-#endif
// padding
nullptr,
nullptr,
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -37,7 +37,7 @@
eglInitialize(eglDisplay, nullptr, nullptr);
- if (!eglBindAPI(EGL_OPENGL_ES_API))
+ if (!eglBindAPI(EGL_OPENGL_ES_API) || !wpe_fdo_initialize_for_egl_display(eglDisplay))
return nullptr;
static const EGLint configAttributes[13] = {
@@ -74,12 +74,8 @@
, m_view(view)
, m_size(size)
{
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
- wpe_loader_init("libWPEBackend-fdo-0.1.so");
-#endif
+ wpe_loader_init("libWPEBackend-fdo-1.0.so");
- wpe_fdo_initialize_for_egl_display(m_eglDisplay);
-
imageTargetTexture2DOES = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
static const char* vertexShaderSource =
@@ -128,9 +124,7 @@
m_exportable = wpe_view_backend_exportable_fdo_egl_create(&exportableClient, this, m_size.width(), m_size.height());
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
-#endif
m_surface.setFormat(context->format());
m_surface.create();
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -83,6 +83,11 @@
void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
{
+#if PLATFORM(WPE)
+ parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
+ parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
+#endif
+
parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModel::DocumentViewer;
parameters.proxySettings = m_networkProxySettings;
Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/FindWPEBackend-fdo.cmake (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/cmake/FindWPEBackend-fdo.cmake 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/FindWPEBackend-fdo.cmake 2019-02-27 22:59:13 UTC (rev 242163)
@@ -29,7 +29,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
find_package(PkgConfig)
-pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo-0.1)
+pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo-1.0)
find_path(WPEBACKEND_FDO_INCLUDE_DIRS
NAMES wpe/fdo.h
@@ -37,7 +37,7 @@
)
find_library(WPEBACKEND_FDO_LIBRARIES
- NAMES WPEBackend-fdo-0.1
+ NAMES WPEBackend-fdo-1.0
HINTS ${PC_WPEBACKEND_FDO_LIBDIR} ${PC_WPEBACKEND_FDO_LIBRARY_DIRS}
)
Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/OptionsWPE.cmake 2019-02-27 22:59:13 UTC (rev 242163)
@@ -138,7 +138,7 @@
find_package(Qt5 REQUIRED COMPONENTS Core Quick Gui)
find_package(Qt5Test REQUIRED)
find_package(PkgConfig)
- pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-0.1)
+ pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-1.0)
endif ()
add_definitions(-DBUILDING_WPE__=1)
Modified: releases/WebKitGTK/webkit-2.24/Tools/ChangeLog (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/ChangeLog 2019-02-27 22:59:13 UTC (rev 242163)
@@ -1,3 +1,28 @@
+2019-02-25 Adrian Perez de Castro <ape...@igalia.com>
+
+ [WPE] Bump WPEBackend-fdo requirement to API version 1.0
+ https://bugs.webkit.org/show_bug.cgi?id=195001
+
+ Reviewed by Carlos Garcia Campos.
+
+ API version 1.0 always includes the functionality previously guarded with
+ WPE_BACKEND_CHECK_VERSION(): remove the guards and always use the new functions
+ unconditionally.
+
+ * TestWebKitAPI/glib/WebKitGLib/TestMain.h:
+ (Test::createWebViewBackend): Remove usage of WPE_BACKEND_CHECK_VERSION().
+ * TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp:
+ (WebViewTest::showInWindow): Ditto.
+ (WebViewTest::hideView): Ditto.
+ * wpe/backends/HeadlessViewBackend.cpp:
+ (WPEToolingBackends::HeadlessViewBackend::HeadlessViewBackend): Ditto.
+ * wpe/backends/ViewBackend.cpp:
+ (WPEToolingBackends::ViewBackend::ViewBackend): Use libWPEBackend-fdo-1.0 as library name.
+ * wpe/backends/WindowViewBackend.cpp:
+ (WPEToolingBackends::WindowViewBackend::WindowViewBackend): Remove usage of
+ WPE_BACKEND_CHECK_VERSION().
+ * wpe/jhbuild.modules: Build a version WPEBackend-fdo with the updated API version.
+
2019-02-21 Adrian Perez de Castro <ape...@igalia.com>
[WPE] Do not hardcode WPEBackend-fdo library name for linking tests
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h 2019-02-27 22:59:13 UTC (rev 242163)
@@ -143,10 +143,8 @@
static WebKitWebViewBackend* createWebViewBackend()
{
auto* headlessBackend = new WPEToolingBackends::HeadlessViewBackend(800, 600);
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
// Make the view initially hidden for consistency with GTK+ tests.
wpe_view_backend_remove_activity_state(headlessBackend->backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused);
-#endif
return webkit_web_view_backend_new(headlessBackend->backend(), [](gpointer userData) {
delete static_cast<WPEToolingBackends::HeadlessViewBackend*>(userData);
}, headlessBackend);
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -43,18 +43,14 @@
void WebViewTest::showInWindow()
{
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
auto* backend = webkit_web_view_backend_get_wpe_backend(webkit_web_view_get_backend(m_webView));
wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_in_window | wpe_view_activity_state_focused);
-#endif
}
void WebViewTest::hideView()
{
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
auto* backend = webkit_web_view_backend_get_wpe_backend(webkit_web_view_get_backend(m_webView));
wpe_view_backend_remove_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_focused);
-#endif
}
void WebViewTest::mouseMoveTo(int x, int y, unsigned mouseModifiers)
Modified: releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/HeadlessViewBackend.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/HeadlessViewBackend.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/HeadlessViewBackend.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -72,9 +72,7 @@
if (!initialize())
return;
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
-#endif
if (!eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, m_eglContext))
return;
Modified: releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/ViewBackend.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/ViewBackend.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/ViewBackend.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -35,9 +35,7 @@
: m_width(width)
, m_height(height)
{
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
- wpe_loader_init("libWPEBackend-fdo-0.1.so");
-#endif
+ wpe_loader_init("libWPEBackend-fdo-1.0.so");
}
ViewBackend::~ViewBackend()
Modified: releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/wpe/backends/WindowViewBackend.cpp 2019-02-27 22:59:13 UTC (rev 242163)
@@ -439,7 +439,6 @@
auto& window = *static_cast<WindowViewBackend*>(data);
wpe_view_backend_dispatch_set_size(window.backend(), width, height);
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
bool isFocused = false;
void* p;
wl_array_for_each(p, states)
@@ -462,19 +461,12 @@
wpe_view_backend_add_activity_state(window.backend(), wpe_view_activity_state_focused);
else
wpe_view_backend_remove_activity_state(window.backend(), wpe_view_activity_state_focused);
-#else
- (void)states;
-#endif
},
// close
[](void* data, struct zxdg_toplevel_v6*)
{
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
auto& window = *static_cast<WindowViewBackend*>(data);
wpe_view_backend_remove_activity_state(window.backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
-#else
- (void)data;
-#endif
},
};
@@ -525,9 +517,7 @@
zxdg_toplevel_v6_add_listener(m_xdgToplevel, &s_xdgToplevelListener, this);
zxdg_toplevel_v6_set_title(m_xdgToplevel, "WPE");
wl_surface_commit(m_surface);
-#if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_in_window);
-#endif
}
}
Modified: releases/WebKitGTK/webkit-2.24/Tools/wpe/jhbuild.modules (242162 => 242163)
--- releases/WebKitGTK/webkit-2.24/Tools/wpe/jhbuild.modules 2019-02-27 22:57:25 UTC (rev 242162)
+++ releases/WebKitGTK/webkit-2.24/Tools/wpe/jhbuild.modules 2019-02-27 22:59:13 UTC (rev 242163)
@@ -201,8 +201,8 @@
<dep package="libwpe"/>
<dep package="glib"/>
</dependencies>
- <branch repo="wpewebkit" module="wpebackend-fdo-1.1.0.tar.xz" version="1.1.0"
- hash="sha256:f6c72130d16e50860cb83eb0f6e109c76f1826d2c6bee39025fb3651941761e7"/>
+ <branch repo="wpewebkit" module="wpebackend-fdo-1.1.90.tar.xz" version="1.1.90"
+ hash="sha256:31d9f1ae06968fe752055dde9d5cd7d5fd044c1aec92798bc0491d9a9cef84da"/>
</cmake>
<autotools id="libgpg-error" autogen-sh="configure">
