From 20fbd38b77b7fcf445fa72855475112e84814f52 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 28 Jan 2025 10:40:32 +0100 Subject: [PATCH] LibWeb: Remove MetalContext from TraversableNavigable There's no need for TraversableNavigable to keep track of the MetalContext; our SkiaBackendContext keeps a reference to it. --- Libraries/LibWeb/HTML/TraversableNavigable.cpp | 8 ++++---- Libraries/LibWeb/HTML/TraversableNavigable.h | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Libraries/LibWeb/HTML/TraversableNavigable.cpp b/Libraries/LibWeb/HTML/TraversableNavigable.cpp index a2c363599ff..6dbcf0633a9 100644 --- a/Libraries/LibWeb/HTML/TraversableNavigable.cpp +++ b/Libraries/LibWeb/HTML/TraversableNavigable.cpp @@ -30,9 +30,9 @@ TraversableNavigable::TraversableNavigable(GC::Ref page) { #ifdef AK_OS_MACOS auto display_list_player_type = page->client().display_list_player_type(); - if (display_list_player_type == DisplayListPlayerType::SkiaGPUIfAvailable) { - m_metal_context = Gfx::get_metal_context(); - m_skia_backend_context = Gfx::SkiaBackendContext::create_metal_context(*m_metal_context); + if (display_list_player_type == DisplayListPlayerType::SkiaGPUIfAvailable) + auto metal_context = Gfx::get_metal_context(); + m_skia_backend_context = Gfx::SkiaBackendContext::create_metal_context(*metal_context); } #endif @@ -1402,7 +1402,7 @@ void TraversableNavigable::paint(DevicePixelRect const& content_rect, Painting:: switch (page().client().display_list_player_type()) { case DisplayListPlayerType::SkiaGPUIfAvailable: { #ifdef AK_OS_MACOS - if (m_metal_context && m_skia_backend_context && is(target)) { + if (m_skia_backend_context && is(target)) { auto& iosurface_backing_store = static_cast(target); auto painting_surface = Gfx::PaintingSurface::wrap_iosurface(iosurface_backing_store.iosurface_handle(), *m_skia_backend_context); Painting::DisplayListPlayerSkia player(*m_skia_backend_context, painting_surface); diff --git a/Libraries/LibWeb/HTML/TraversableNavigable.h b/Libraries/LibWeb/HTML/TraversableNavigable.h index f4e132a6e00..4753238d915 100644 --- a/Libraries/LibWeb/HTML/TraversableNavigable.h +++ b/Libraries/LibWeb/HTML/TraversableNavigable.h @@ -155,10 +155,6 @@ private: String m_window_handle; RefPtr m_skia_backend_context; - -#ifdef AK_OS_MACOS - RefPtr m_metal_context; -#endif }; struct BrowsingContextAndDocument {