Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Migrate SkSurface::getBackend* methods to static functions #41693

Merged
jason-simmons merged 1 commit into from
May 3, 2023
+12 −9
Merged

Migrate SkSurface::getBackend* methods to static functions #41693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions shell/platform/embedder/tests/embedder_test_backingstore_producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "third_party/skia/include/core/SkImageInfo.h"
#include "third_party/skia/include/core/SkSize.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"

#include <cstdlib>
#include <memory>
Expand Down Expand Up @@ -97,8 +98,8 @@ bool EmbedderTestBackingStoreProducer::CreateFramebuffer(
return false;
}

GrBackendRenderTarget render_target = surface->getBackendRenderTarget(
SkSurface::BackendHandleAccess::kDiscardWrite_BackendHandleAccess);
GrBackendRenderTarget render_target = SkSurfaces::GetBackendRenderTarget(
surface.get(), SkSurfaces::BackendHandleAccess::kDiscardWrite);

if (!render_target.isValid()) {
FML_LOG(ERROR) << "Backend render target was invalid.";
Expand Down Expand Up @@ -150,8 +151,8 @@ bool EmbedderTestBackingStoreProducer::CreateTexture(
return false;
}

GrBackendTexture render_texture = surface->getBackendTexture(
SkSurface::BackendHandleAccess::kDiscardWrite_BackendHandleAccess);
GrBackendTexture render_texture = SkSurfaces::GetBackendTexture(
surface.get(), SkSurfaces::BackendHandleAccess::kDiscardWrite);

if (!render_texture.isValid()) {
FML_LOG(ERROR) << "Backend render texture was invalid.";
Expand Down
7 changes: 4 additions & 3 deletions shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrBackendSemaphore.h"
#include "third_party/skia/include/gpu/GrBackendSurface.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/vk/GrVkBackendContext.h"
#include "third_party/skia/include/gpu/vk/GrVkExtensions.h"
#include "third_party/skia/include/gpu/vk/GrVkTypes.h"
Expand Down Expand Up @@ -221,9 +222,9 @@ bool VulkanSurfaceProducer::TransitionSurfacesToExternal(
if (!command_buffer->Begin())
return false;

GrBackendRenderTarget backendRT =
vk_surface->GetSkiaSurface()->getBackendRenderTarget(
SkSurface::kFlushRead_BackendHandleAccess);
GrBackendRenderTarget backendRT = SkSurfaces::GetBackendRenderTarget(
vk_surface->GetSkiaSurface().get(),
SkSurfaces::BackendHandleAccess::kFlushRead);
if (!backendRT.isValid()) {
return false;
}
Expand Down
5 changes: 3 additions & 2 deletions vulkan/vulkan_swapchain.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrBackendSurface.h"
#include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/vk/GrVkTypes.h"

#include "vulkan_backbuffer.h"
Expand Down Expand Up @@ -476,8 +477,8 @@ VulkanSwapchain::AcquireResult VulkanSwapchain::AcquireSurface() {
return error;
}

GrBackendRenderTarget backendRT = surface->getBackendRenderTarget(
SkSurface::kFlushRead_BackendHandleAccess);
GrBackendRenderTarget backendRT = SkSurfaces::GetBackendRenderTarget(
surface.get(), SkSurfaces::BackendHandleAccess::kFlushRead);
if (!backendRT.isValid()) {
FML_DLOG(INFO) << "Could not get backend render target.";
return error;
Expand Down