Changeset 242055 in webkit


Ignore:
Timestamp:
Feb 25, 2019 1:48:24 PM (5 years ago)
Author:
Adrian Perez de Castro
Message:

[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.

Source/WebKit:

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().

Tools:

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.
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r242033 r242055  
     12019-02-25  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE] Bump WPEBackend-fdo requirement to API version 1.0
     4        https://bugs.webkit.org/show_bug.cgi?id=195001
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Source/cmake/FindWPEBackend-fdo.cmake: Use WPEBackend-fdo-1.0.
     9        * Source/cmake/OptionsWPE.cmake: Ditto.
     10
    1112019-02-25  Miguel Gomez  <magomez@igalia.com>
    212

  • trunk/Source/WebKit/ChangeLog

    r242050 r242055  
     12019-02-25  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE] Bump WPEBackend-fdo requirement to API version 1.0
     4        https://bugs.webkit.org/show_bug.cgi?id=195001
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        API version 1.0 always includes the functionality previously guarded with
     9        WPE_BACKEND_CHECK_VERSION(): remove the guards and always use the new functions
     10        unconditionally.
     11
     12        * UIProcess/API/wpe/WPEView.cpp:
     13        (WKWPE::View::View): Remove usage of WPE_BACKEND_CHECK_VERSION().
     14        (WKWPE::m_backend): Ditto.
     15        * UIProcess/API/wpe/qt/WPEQtViewBackend.cpp:
     16        (WPEQtViewBackend::WPEQtViewBackend): Use libWPEBackend-fdo-1.0 as
     17        library name, remove call to wpe_fdo_initialize_for_egl_display().
     18        (WPEQtViewBackend::create): Call wpe_fdo_initialize_for_egl_display()
     19        here, to bail out early in case initialization fails.
     20        * UIProcess/glib/WebProcessPoolGLib.cpp:
     21        (WebKit::WebProcessPool::platformInitializeWebProcess): Remove usage of
     22        WPE_BACKEND_CHECK_VERSION().
     23
    1242019-02-25  Per Arne Vollan  <pvollan@apple.com>
    225

  • trunk/Source/WebKit/UIProcess/API/wpe/WPEView.cpp

    r241654 r242055  
    4646    , m_pageClient(std::make_unique<PageClientImpl>(*this))
    4747    , m_size { 800, 600 }
    48 #if !defined(WPE_BACKEND_CHECK_VERSION) || !WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    4948    , m_viewStateFlags { WebCore::ActivityState::WindowIsActive, WebCore::ActivityState::IsFocused, WebCore::ActivityState::IsVisible, WebCore::ActivityState::IsInWindow }
    50 #endif
    5149    , m_backend(backend)
    5250{
    … …  
    8886            view.frameDisplayed();
    8987        },
    90 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    9188        // activity_state_changed
    9289        [](void* data, uint32_t state)
    … …  
    104101            view.setViewState(flags);
    105102        },
    106 #else
    107         nullptr,
    108 #endif
    109103        // padding
    110104        nullptr,

  • trunk/Source/WebKit/UIProcess/API/wpe/qt/WPEQtViewBackend.cpp

    r240141 r242055  
    3838    eglInitialize(eglDisplay, nullptr, nullptr);
    3939
    40     if (!eglBindAPI(EGL_OPENGL_ES_API))
     40    if (!eglBindAPI(EGL_OPENGL_ES_API) || !wpe_fdo_initialize_for_egl_display(eglDisplay))
    4141        return nullptr;
    4242
    … …  
    7575    , m_size(size)
    7676{
    77 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
    78     wpe_loader_init("libWPEBackend-fdo-0.1.so");
    79 #endif
    80 
    81     wpe_fdo_initialize_for_egl_display(m_eglDisplay);
     77    wpe_loader_init("libWPEBackend-fdo-1.0.so");
    8278
    8379    imageTargetTexture2DOES = reinterpret_cast<PFNGLEGLIMAGETARGETTEXTURE2DOESPROC>(eglGetProcAddress("glEGLImageTargetTexture2DOES"));
    … …  
    129125    m_exportable = wpe_view_backend_exportable_fdo_egl_create(&exportableClient, this, m_size.width(), m_size.height());
    130126
    131 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    132127    wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
    133 #endif
    134128
    135129    m_surface.setFormat(context->format());

  • trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp

    r242042 r242055  
    9393#if PLATFORM(WPE)
    9494    parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
    95 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
    9695    parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
    97 #endif
    9896#endif
    9997

  • trunk/Source/cmake/FindWPEBackend-fdo.cmake

    r241866 r242055  
    3030
    3131find_package(PkgConfig)
    32 pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo-0.1)
     32pkg_check_modules(PC_WPEBACKEND_FDO QUIET wpebackend-fdo-1.0)
    3333
    3434find_path(WPEBACKEND_FDO_INCLUDE_DIRS
    … …  
    3838
    3939find_library(WPEBACKEND_FDO_LIBRARIES
    40     NAMES WPEBackend-fdo-0.1
     40    NAMES WPEBackend-fdo-1.0
    4141    HINTS ${PC_WPEBACKEND_FDO_LIBDIR} ${PC_WPEBACKEND_FDO_LIBRARY_DIRS}
    4242)

  • trunk/Source/cmake/OptionsWPE.cmake

    r242033 r242055  
    141141    find_package(Qt5Test REQUIRED)
    142142    find_package(PkgConfig)
    143     pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-0.1)
     143    pkg_check_modules(WPE_BACKEND_FDO REQUIRED wpebackend-fdo-1.0)
    144144endif ()
    145145

  • trunk/Tools/ChangeLog

    r242040 r242055  
     12019-02-25  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        [WPE] Bump WPEBackend-fdo requirement to API version 1.0
     4        https://bugs.webkit.org/show_bug.cgi?id=195001
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        API version 1.0 always includes the functionality previously guarded with
     9        WPE_BACKEND_CHECK_VERSION(): remove the guards and always use the new functions
     10        unconditionally.
     11
     12        * TestWebKitAPI/glib/WebKitGLib/TestMain.h:
     13        (Test::createWebViewBackend): Remove usage of WPE_BACKEND_CHECK_VERSION().
     14        * TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp:
     15        (WebViewTest::showInWindow): Ditto.
     16        (WebViewTest::hideView): Ditto.
     17        * wpe/backends/HeadlessViewBackend.cpp:
     18        (WPEToolingBackends::HeadlessViewBackend::HeadlessViewBackend): Ditto.
     19        * wpe/backends/ViewBackend.cpp:
     20        (WPEToolingBackends::ViewBackend::ViewBackend): Use libWPEBackend-fdo-1.0 as library name.
     21        * wpe/backends/WindowViewBackend.cpp:
     22        (WPEToolingBackends::WindowViewBackend::WindowViewBackend): Remove usage of
     23        WPE_BACKEND_CHECK_VERSION().
     24        * wpe/jhbuild.modules: Build a version WPEBackend-fdo with the updated API version.
     25
    1262019-02-25  Thibault Saunier  <tsaunier@igalia.com>
    227

  • trunk/Tools/TestWebKitAPI/glib/WebKitGLib/TestMain.h

    r239772 r242055  
    144144    {
    145145        auto* headlessBackend = new WPEToolingBackends::HeadlessViewBackend(800, 600);
    146 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    147146        // Make the view initially hidden for consistency with GTK+ tests.
    148147        wpe_view_backend_remove_activity_state(headlessBackend->backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused);
    149 #endif
    150148        return webkit_web_view_backend_new(headlessBackend->backend(), [](gpointer userData) {
    151149            delete static_cast<WPEToolingBackends::HeadlessViewBackend*>(userData);

  • trunk/Tools/TestWebKitAPI/glib/WebKitGLib/wpe/WebViewTestWPE.cpp

    r239203 r242055  
    4444void WebViewTest::showInWindow()
    4545{
    46 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    4746    auto* backend = webkit_web_view_backend_get_wpe_backend(webkit_web_view_get_backend(m_webView));
    4847    wpe_view_backend_add_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_in_window | wpe_view_activity_state_focused);
    49 #endif
    5048}
    5149
    5250void WebViewTest::hideView()
    5351{
    54 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    5552    auto* backend = webkit_web_view_backend_get_wpe_backend(webkit_web_view_get_backend(m_webView));
    5653    wpe_view_backend_remove_activity_state(backend, wpe_view_activity_state_visible | wpe_view_activity_state_focused);
    57 #endif
    5854}
    5955

  • trunk/Tools/wpe/backends/HeadlessViewBackend.cpp

    r239203 r242055  
    7373        return;
    7474
    75 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    7675    wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
    77 #endif
    7876
    7977    if (!eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, m_eglContext))

  • trunk/Tools/wpe/backends/ViewBackend.cpp

    r234193 r242055  
    3636    , m_height(height)
    3737{
    38 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(0, 2, 0)
    39     wpe_loader_init("libWPEBackend-fdo-0.1.so");
    40 #endif
     38    wpe_loader_init("libWPEBackend-fdo-1.0.so");
    4139}
    4240

  • trunk/Tools/wpe/backends/WindowViewBackend.cpp

    r239203 r242055  
    440440        wpe_view_backend_dispatch_set_size(window.backend(), width, height);
    441441
    442 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    443442        bool isFocused = false;
    444443        void* p;
    … …  
    463462        else
    464463            wpe_view_backend_remove_activity_state(window.backend(), wpe_view_activity_state_focused);
    465 #else
    466         (void)states;
    467 #endif
    468464    },
    469465    // close
    470466    [](void* data, struct zxdg_toplevel_v6*)
    471467    {
    472 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    473468        auto& window = *static_cast<WindowViewBackend*>(data);
    474469        wpe_view_backend_remove_activity_state(window.backend(), wpe_view_activity_state_visible | wpe_view_activity_state_focused | wpe_view_activity_state_in_window);
    475 #else
    476         (void)data;
    477 #endif
    478470    },
    479471};
    … …  
    526518            zxdg_toplevel_v6_set_title(m_xdgToplevel, "WPE");
    527519            wl_surface_commit(m_surface);
    528 #if defined(WPE_BACKEND_CHECK_VERSION) && WPE_BACKEND_CHECK_VERSION(1, 1, 0)
    529520            wpe_view_backend_add_activity_state(backend(), wpe_view_activity_state_visible | wpe_view_activity_state_in_window);
    530 #endif
    531521        }
    532522    }

  • trunk/Tools/wpe/jhbuild.modules

    r242036 r242055  
    203203    </dependencies>
    204204    <branch repo="github.com" module="Igalia/wpebackend-fdo.git" checkoutdir="wpebackend-fdo"
    205             tag="d7eeab26375b1f08c6a35dbe2d34f02197708a03"/>
     205            tag="fa227dac7c6a133d62b35d7a6af0332582b64d4d"/>
    206206  </cmake>
    207207
Note: See TracChangeset for help on using the changeset viewer.