Changeset 245337 in webkit


Ignore:
Timestamp:
May 15, 2019 12:06:06 PM (5 years ago)
Author:
don.olmstead@sony.com
Message:

Add USE(LIBWPE) for AcceleratedSurface
​https://bugs.webkit.org/show_bug.cgi?id=197918

Reviewed by Michael Catanzaro.

Renamed AcceleratedSurfaceWPE to AcceleratedSurfaceLibWPE since it just uses the
libwpe APIs.

  • PlatformWPE.cmake:
  • SourcesWPE.txt:
  • WebProcess/WebPage/AcceleratedSurface.cpp:

(WebKit::AcceleratedSurface::create):

  • WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp: Renamed from Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp.

(WebKit::AcceleratedSurfaceLibWPE::create):
(WebKit::AcceleratedSurfaceLibWPE::AcceleratedSurfaceLibWPE):
(WebKit::AcceleratedSurfaceLibWPE::~AcceleratedSurfaceLibWPE):
(WebKit::AcceleratedSurfaceLibWPE::initialize):
(WebKit::AcceleratedSurfaceLibWPE::finalize):
(WebKit::AcceleratedSurfaceLibWPE::window const):
(WebKit::AcceleratedSurfaceLibWPE::surfaceID const):
(WebKit::AcceleratedSurfaceLibWPE::clientResize):
(WebKit::AcceleratedSurfaceLibWPE::willRenderFrame):
(WebKit::AcceleratedSurfaceLibWPE::didRenderFrame):

  • WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.h: Renamed from Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h.
Location:
trunk/Source/WebKit
Files:
1 added
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r245335 r245337  
     12019-05-15  Don Olmstead  <don.olmstead@sony.com>
     2
     3        Add USE(LIBWPE) for AcceleratedSurface
     4        https://bugs.webkit.org/show_bug.cgi?id=197918
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Renamed AcceleratedSurfaceWPE to AcceleratedSurfaceLibWPE since it just uses the
     9        libwpe APIs.
     10
     11        * PlatformWPE.cmake:
     12        * SourcesWPE.txt:
     13        * WebProcess/WebPage/AcceleratedSurface.cpp:
     14        (WebKit::AcceleratedSurface::create):
     15        * WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp: Renamed from Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp.
     16        (WebKit::AcceleratedSurfaceLibWPE::create):
     17        (WebKit::AcceleratedSurfaceLibWPE::AcceleratedSurfaceLibWPE):
     18        (WebKit::AcceleratedSurfaceLibWPE::~AcceleratedSurfaceLibWPE):
     19        (WebKit::AcceleratedSurfaceLibWPE::initialize):
     20        (WebKit::AcceleratedSurfaceLibWPE::finalize):
     21        (WebKit::AcceleratedSurfaceLibWPE::window const):
     22        (WebKit::AcceleratedSurfaceLibWPE::surfaceID const):
     23        (WebKit::AcceleratedSurfaceLibWPE::clientResize):
     24        (WebKit::AcceleratedSurfaceLibWPE::willRenderFrame):
     25        (WebKit::AcceleratedSurfaceLibWPE::didRenderFrame):
     26        * WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.h: Renamed from Source/WebKit/WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.h.
     27
    1282019-05-15  Youenn Fablet  <youenn@apple.com>
    229

  • trunk/Source/WebKit/PlatformWPE.cmake

    r244541 r245337  
    266266    "${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup"
    267267    "${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
     268    "${WEBKIT_DIR}/WebProcess/WebPage/libwpe"
    268269    "${WEBKIT_DIR}/WebProcess/WebPage/wpe"
    269270    "${WTF_DIR}/wtf/gtk/"

  • trunk/Source/WebKit/SourcesWPE.txt

    r245241 r245337  
    251251WebProcess/WebPage/gstreamer/WebPageGStreamer.cpp
    252252
    253 WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp @no-unify
     253WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp @no-unify
     254
    254255WebProcess/WebPage/wpe/WebInspectorUIWPE.cpp
    255256WebProcess/WebPage/wpe/WebPageWPE.cpp

  • trunk/Source/WebKit/WebProcess/WebPage/AcceleratedSurface.cpp

    r237410 r245337  
    3838#endif
    3939
    40 #if PLATFORM(WPE)
    41 #include "AcceleratedSurfaceWPE.h"
     40#if USE(LIBWPE)
     41#include "AcceleratedSurfaceLibWPE.h"
    4242#endif
    4343
    … …  
    5555        return AcceleratedSurfaceX11::create(webPage, client);
    5656#endif
    57 #if PLATFORM(WPE)
     57#if USE(LIBWPE)
    5858    if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::WPE)
    59         return AcceleratedSurfaceWPE::create(webPage, client);
     59        return AcceleratedSurfaceLibWPE::create(webPage, client);
    6060#endif
    6161    return nullptr;

  • trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.cpp

    r245336 r245337  
    2525
    2626#include "config.h"
    27 #include "AcceleratedSurfaceWPE.h"
     27#include "AcceleratedSurfaceLibWPE.h"
    2828
    2929#include "WebPage.h"
    … …  
    3434using namespace WebCore;
    3535
    36 std::unique_ptr<AcceleratedSurfaceWPE> AcceleratedSurfaceWPE::create(WebPage& webPage, Client& client)
     36std::unique_ptr<AcceleratedSurfaceLibWPE> AcceleratedSurfaceLibWPE::create(WebPage& webPage, Client& client)
    3737{
    38     return std::unique_ptr<AcceleratedSurfaceWPE>(new AcceleratedSurfaceWPE(webPage, client));
     38    return std::unique_ptr<AcceleratedSurfaceLibWPE>(new AcceleratedSurfaceLibWPE(webPage, client));
    3939}
    4040
    41 AcceleratedSurfaceWPE::AcceleratedSurfaceWPE(WebPage& webPage, Client& client)
     41AcceleratedSurfaceLibWPE::AcceleratedSurfaceLibWPE(WebPage& webPage, Client& client)
    4242    : AcceleratedSurface(webPage, client)
    4343{
    4444}
    4545
    46 AcceleratedSurfaceWPE::~AcceleratedSurfaceWPE()
     46AcceleratedSurfaceLibWPE::~AcceleratedSurfaceLibWPE()
    4747{
    4848    ASSERT(!m_backend);
    4949}
    5050
    51 void AcceleratedSurfaceWPE::initialize()
     51void AcceleratedSurfaceLibWPE::initialize()
    5252{
    5353    m_backend = wpe_renderer_backend_egl_target_create(m_webPage.releaseHostFileDescriptor());
    … …  
    5656        [](void* data)
    5757        {
    58             auto& surface = *reinterpret_cast<AcceleratedSurfaceWPE*>(data);
     58            auto& surface = *reinterpret_cast<AcceleratedSurfaceLibWPE*>(data);
    5959            surface.m_client.frameComplete();
    6060        },
    … …  
    7070}
    7171
    72 void AcceleratedSurfaceWPE::finalize()
     72void AcceleratedSurfaceLibWPE::finalize()
    7373{
    7474    wpe_renderer_backend_egl_target_destroy(m_backend);
    … …  
    7676}
    7777
    78 uint64_t AcceleratedSurfaceWPE::window() const
     78uint64_t AcceleratedSurfaceLibWPE::window() const
    7979{
    8080    ASSERT(m_backend);
    … …  
    8787}
    8888
    89 uint64_t AcceleratedSurfaceWPE::surfaceID() const
     89uint64_t AcceleratedSurfaceLibWPE::surfaceID() const
    9090{
    9191    return m_webPage.pageID();
    9292}
    9393
    94 void AcceleratedSurfaceWPE::clientResize(const IntSize& size)
     94void AcceleratedSurfaceLibWPE::clientResize(const IntSize& size)
    9595{
    9696    ASSERT(m_backend);
    … …  
    9898}
    9999
    100 void AcceleratedSurfaceWPE::willRenderFrame()
     100void AcceleratedSurfaceLibWPE::willRenderFrame()
    101101{
    102102    ASSERT(m_backend);
    … …  
    104104}
    105105
    106 void AcceleratedSurfaceWPE::didRenderFrame()
     106void AcceleratedSurfaceLibWPE::didRenderFrame()
    107107{
    108108    ASSERT(m_backend);

  • trunk/Source/WebKit/WebProcess/WebPage/libwpe/AcceleratedSurfaceLibWPE.h

    r245336 r245337  
    3636class WebPage;
    3737
    38 class AcceleratedSurfaceWPE final : public AcceleratedSurface {
    39     WTF_MAKE_NONCOPYABLE(AcceleratedSurfaceWPE); WTF_MAKE_FAST_ALLOCATED;
     38class AcceleratedSurfaceLibWPE final : public AcceleratedSurface {
     39    WTF_MAKE_NONCOPYABLE(AcceleratedSurfaceLibWPE); WTF_MAKE_FAST_ALLOCATED;
    4040public:
    41     static std::unique_ptr<AcceleratedSurfaceWPE> create(WebPage&, Client&);
    42     ~AcceleratedSurfaceWPE();
     41    static std::unique_ptr<AcceleratedSurfaceLibWPE> create(WebPage&, Client&);
     42    ~AcceleratedSurfaceLibWPE();
    4343
    4444    uint64_t window() const override;
    … …  
    5353
    5454private:
    55     AcceleratedSurfaceWPE(WebPage&, Client&);
     55    AcceleratedSurfaceLibWPE(WebPage&, Client&);
    5656
    5757    struct wpe_renderer_backend_egl_target* m_backend { nullptr };
Note: See TracChangeset for help on using the changeset viewer.