Skip to content

Commit

Permalink
Meta+LibWeb: Update Skia to version 129
Browse files Browse the repository at this point in the history
  • Loading branch information
kalenikaliaksandr authored and trflynn89 committed Sep 19, 2024
1 parent ea4a6c3 commit 15c47dc
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 4 deletions.
Binary file modified Tests/LibWeb/Screenshot/images/border-radius-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/canvas-arcs-and-ellipses-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/canvas-text-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/css-background-clip-text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/opacity-stacking-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/svg-text-effects-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/svg-textPath-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/LibWeb/Screenshot/images/text-shadow-ref.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Userland/Libraries/LibWeb/Painting/DisplayListPlayerSkia.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@

#ifdef USE_VULKAN
# include <gpu/ganesh/vk/GrVkDirectContext.h>
# include <gpu/vk/GrVkBackendContext.h>
# include <gpu/vk/VulkanBackendContext.h>
# include <gpu/vk/VulkanExtensions.h>
#endif

#ifdef AK_OS_MACOS
# include <gpu/GrBackendSurface.h>
# include <gpu/ganesh/mtl/GrMtlBackendContext.h>
# include <gpu/ganesh/mtl/GrMtlBackendSurface.h>
# include <gpu/ganesh/mtl/GrMtlDirectContext.h>
#endif

Expand Down Expand Up @@ -104,7 +104,7 @@ class SkiaVulkanBackendContext final : public SkiaBackendContext {

OwnPtr<SkiaBackendContext> DisplayListPlayerSkia::create_vulkan_context(Core::VulkanContext& vulkan_context)
{
GrVkBackendContext backend_context;
skgpu::VulkanBackendContext backend_context;

backend_context.fInstance = vulkan_context.instance;
backend_context.fDevice = vulkan_context.logical_device;
Expand Down Expand Up @@ -155,7 +155,7 @@ class SkiaMetalBackendContext final : public SkiaBackendContext {
{
GrMtlTextureInfo mtl_info;
mtl_info.fTexture = sk_ret_cfp(metal_texture.texture());
auto backend_render_target = GrBackendRenderTarget(metal_texture.width(), metal_texture.height(), mtl_info);
auto backend_render_target = GrBackendRenderTargets::MakeMtl(metal_texture.width(), metal_texture.height(), mtl_info);
return SkSurfaces::WrapBackendRenderTarget(m_context.get(), backend_render_target, kTopLeft_GrSurfaceOrigin, kBGRA_8888_SkColorType, nullptr, nullptr);
}

Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
},
{
"name": "skia",
"version": "124#0"
"version": "129#0"
},
{
"name": "sqlite3",
Expand Down

0 comments on commit 15c47dc

Please sign in to comment.