Changeset 205431 in webkit


Ignore:
Timestamp:
Sep 5, 2016 12:57:57 AM (8 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] SetNativeSurfaceHandleForCompositing should not be compiled in for wayland build
​https://bugs.webkit.org/show_bug.cgi?id=161483

Reviewed by Žan Doberšek.

SetNativeSurfaceHandleForCompositing and DestroyNativeSurfaceHandleForCompositing messages should only be used
for GTK+ port when compiled with OpenGL and X11 enabled and redirected XComposite window disabled. So, we should
use USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW) consistently.
This fixes the build when building the GTK+ port with Wayland enabled and X11 disabled.

  • UIProcess/AcceleratedDrawingAreaProxy.cpp:

(WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState):

  • UIProcess/AcceleratedDrawingAreaProxy.h:
  • WebProcess/WebPage/AcceleratedDrawingArea.cpp:

(WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):

  • WebProcess/WebPage/AcceleratedDrawingArea.h:
  • WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
  • WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
  • WebProcess/WebPage/DrawingArea.h:
  • WebProcess/WebPage/DrawingArea.messages.in:
  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
  • WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r205429 r205431  
     12016-09-05  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] SetNativeSurfaceHandleForCompositing should not be compiled in for wayland build
     4        https://bugs.webkit.org/show_bug.cgi?id=161483
     5
     6        Reviewed by Žan Doberšek.
     7
     8        SetNativeSurfaceHandleForCompositing and DestroyNativeSurfaceHandleForCompositing messages should only be used
     9        for GTK+ port when compiled with OpenGL and X11 enabled and redirected XComposite window disabled. So, we should
     10        use USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW) consistently.
     11        This fixes the build when building the GTK+ port with Wayland enabled and X11 disabled.
     12
     13        * UIProcess/AcceleratedDrawingAreaProxy.cpp:
     14        (WebKit::AcceleratedDrawingAreaProxy::didUpdateBackingStoreState):
     15        * UIProcess/AcceleratedDrawingAreaProxy.h:
     16        * WebProcess/WebPage/AcceleratedDrawingArea.cpp:
     17        (WebKit::AcceleratedDrawingArea::enterAcceleratedCompositingMode):
     18        * WebProcess/WebPage/AcceleratedDrawingArea.h:
     19        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp:
     20        * WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h:
     21        * WebProcess/WebPage/DrawingArea.h:
     22        * WebProcess/WebPage/DrawingArea.messages.in:
     23        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp:
     24        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
     25
    1262016-09-05  Zan Dobersek  <zdobersek@igalia.com>
    227

  • trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.cpp

    r205116 r205431  
    140140        m_hasReceivedFirstUpdate = true;
    141141
    142 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     142#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    143143        if (m_pendingNativeSurfaceHandleForCompositing) {
    144144            setNativeSurfaceHandleForCompositing(m_pendingNativeSurfaceHandleForCompositing);
    … …  
    262262}
    263263
    264 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     264#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    265265void AcceleratedDrawingAreaProxy::setNativeSurfaceHandleForCompositing(uint64_t handle)
    266266{

  • trunk/Source/WebKit2/UIProcess/AcceleratedDrawingAreaProxy.h

    r204249 r205431  
    4747#endif
    4848
    49 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     49#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    5050    void setNativeSurfaceHandleForCompositing(uint64_t);
    5151    void destroyNativeSurfaceHandleForCompositing();
    … …  
    100100    bool m_hasReceivedFirstUpdate { false };
    101101
    102 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     102#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    103103    uint64_t m_pendingNativeSurfaceHandleForCompositing { 0 };
    104104#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp

    r204690 r205431  
    321321    ASSERT(!m_layerTreeHost);
    322322    m_layerTreeHost = LayerTreeHost::create(m_webPage);
    323 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     323#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    324324    if (m_nativeSurfaceHandleForCompositing)
    325325        m_layerTreeHost->setNativeSurfaceHandleForCompositing(m_nativeSurfaceHandleForCompositing);
    … …  
    353353#endif
    354354
    355 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     355#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    356356void AcceleratedDrawingArea::setNativeSurfaceHandleForCompositing(uint64_t handle)
    357357{

  • trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.h

    r204690 r205431  
    6464#endif
    6565
    66 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     66#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    6767    void setNativeSurfaceHandleForCompositing(uint64_t) override;
    6868    void destroyNativeSurfaceHandleForCompositing(bool&) override;

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp

    r205395 r205431  
    124124}
    125125
    126 #if PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     126#if PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    127127void ThreadedCoordinatedLayerTreeHost::setNativeSurfaceHandleForCompositing(uint64_t handle)
    128128{

  • trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.h

    r205395 r205431  
    6767    bool forceRepaintAsync(uint64_t callbackID) override { return false; }
    6868
    69 #if PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     69#if PLATFORM(GTK) && PLATFORM(X11) &&  !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    7070    void setNativeSurfaceHandleForCompositing(uint64_t) override;
    7171#endif

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h

    r204668 r205431  
    147147    WebPage& m_webPage;
    148148
    149 #if PLATFORM(GTK) && USE(TEXTURE_MAPPER) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     149#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    150150    uint64_t m_nativeSurfaceHandleForCompositing { 0 };
    151151#endif
    … …  
    173173#endif
    174174
    175 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     175#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    176176    virtual void setNativeSurfaceHandleForCompositing(uint64_t) = 0;
    177177    virtual void destroyNativeSurfaceHandleForCompositing(bool&) = 0;

  • trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in

    r204013 r205431  
    4141#endif
    4242
    43 #if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     43#if USE(TEXTURE_MAPPER) && PLATFORM(GTK) && PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    4444    SetNativeSurfaceHandleForCompositing(uint64_t handle)
    4545    DestroyNativeSurfaceHandleForCompositing() -> (bool handled)

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp

    r205116 r205431  
    409409}
    410410
    411 #if !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     411#if PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    412412void LayerTreeHostGtk::setNativeSurfaceHandleForCompositing(uint64_t handle)
    413413{

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h

    r205116 r205431  
    6868    void setViewOverlayRootLayer(WebCore::GraphicsLayer*) override;
    6969
    70 #if !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     70#if PLATFORM(X11) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
    7171    void setNativeSurfaceHandleForCompositing(uint64_t) override;
    7272#endif
Note: See TracChangeset for help on using the changeset viewer.