Skip to content

Commit

Permalink
[GTK] Move AcceleratedSurfaceDMABuf from gtk to dmabuf directory
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=265249

Reviewed by Alejandro G. Castro.

It's only used by gtk port for now, but it's not gtk specific.

* Source/WebKit/PlatformGTK.cmake:
* Source/WebKit/SourcesGTK.txt:
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp: Renamed from Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp.
(WebKit::generateID):
(WebKit::AcceleratedSurfaceDMABuf::create):
(WebKit::AcceleratedSurfaceDMABuf::AcceleratedSurfaceDMABuf):
(WebKit::AcceleratedSurfaceDMABuf::~AcceleratedSurfaceDMABuf):
(WebKit::generateTargetID):
(WebKit::AcceleratedSurfaceDMABuf::RenderTarget::RenderTarget):
(WebKit::AcceleratedSurfaceDMABuf::RenderTarget::~RenderTarget):
(WebKit::AcceleratedSurfaceDMABuf::RenderTarget::willRenderFrame const):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetColorBuffer::RenderTargetColorBuffer):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetColorBuffer::~RenderTargetColorBuffer):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetColorBuffer::willRenderFrame const):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetEGLImage::create):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetEGLImage::RenderTargetEGLImage):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetEGLImage::~RenderTargetEGLImage):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetSHMImage::create):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetSHMImage::RenderTargetSHMImage):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetSHMImage::didRenderFrame):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetTexture::create):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetTexture::RenderTargetTexture):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetTexture::~RenderTargetTexture):
(WebKit::AcceleratedSurfaceDMABuf::RenderTargetTexture::willRenderFrame const):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::SwapChain):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::setupBufferFormat):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::resize):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::createTarget const):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::nextTarget):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::releaseTarget):
(WebKit::AcceleratedSurfaceDMABuf::SwapChain::reset):
(WebKit::AcceleratedSurfaceDMABuf::didCreateCompositingRunLoop):
(WebKit::AcceleratedSurfaceDMABuf::willDestroyCompositingRunLoop):
(WebKit::AcceleratedSurfaceDMABuf::didCreateGLContext):
(WebKit::AcceleratedSurfaceDMABuf::willDestroyGLContext):
(WebKit::AcceleratedSurfaceDMABuf::surfaceID const):
(WebKit::AcceleratedSurfaceDMABuf::clientResize):
(WebKit::AcceleratedSurfaceDMABuf::willRenderFrame):
(WebKit::AcceleratedSurfaceDMABuf::didRenderFrame):
(WebKit::AcceleratedSurfaceDMABuf::releaseBuffer):
(WebKit::AcceleratedSurfaceDMABuf::frameDone):
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.h: Renamed from Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.h.
* Source/WebKit/WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.messages.in: Renamed from Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.messages.in.

Canonical link: https://commits.webkit.org/271055@main
  • Loading branch information
carlosgcampos committed Nov 22, 2023
1 parent e180ca7 commit 5f79b64
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Source/WebKit/PlatformGTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ list(APPEND WebKit_MESSAGES_IN_FILES

WebProcess/WebPage/ViewGestureGeometryCollector

WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf
WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf

WebProcess/gtk/GtkSettingsManagerProxy
)
Expand Down Expand Up @@ -305,6 +305,7 @@ list(APPEND WebKit_PRIVATE_INCLUDE_DIRECTORIES
"${WEBKIT_DIR}/WebProcess/WebCoreSupport/soup"
"${WEBKIT_DIR}/WebProcess/WebPage/CoordinatedGraphics"
"${WEBKIT_DIR}/WebProcess/WebPage/gtk"
"${WEBKIT_DIR}/WebProcess/WebPage/dmabuf"
)

list(APPEND WebKit_SYSTEM_INCLUDE_DIRECTORIES
Expand Down
3 changes: 2 additions & 1 deletion Source/WebKit/SourcesGTK.txt
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,10 @@ WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp
WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp

WebProcess/WebPage/dmabuf/AcceleratedSurfaceDMABuf.cpp @no-unify

WebProcess/WebPage/glib/WebPageGLib.cpp

WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp @no-unify
WebProcess/WebPage/gtk/AcceleratedSurfaceX11.cpp @no-unify
WebProcess/WebPage/gtk/WebPageGtk.cpp
WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
Expand Down

0 comments on commit 5f79b64

Please sign in to comment.