0

Update Skia flags related to legacy behavior

Many of these do nothing anymore. We add one in to ensure
https://crrev.com/c/5225028 was sufficient (and apparently we needed
to fix two more places).

Change-Id: I4c0d2dd801f6c480b7791763eb5cb88bae6263ac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5247185
Reviewed-by: Vasiliy Telezhnikov <vasilyt@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1254502}
This commit is contained in:
Kevin Lubick
2024-01-31 14:55:04 +00:00
committed by Chromium LUCI CQ
parent c4f8990bfc
commit 972ebe2cf9
4 changed files with 8 additions and 36 deletions
android_webview/test/shell/src/draw_fn
gpu/command_buffer/service/shared_image
skia

@ -42,6 +42,7 @@
#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"
#include "third_party/skia/include/gpu/vk/VulkanMutableTextureState.h"
#include "ui/gfx/color_space.h"
namespace draw_fn {
@ -629,8 +630,9 @@ base::android::ScopedJavaLocalRef<jintArray> ContextManagerVulkan::Draw(
.fSignalSemaphores = &end_semaphore,
};
uint32_t queue_index = device_queue_->GetVulkanQueueIndex();
skgpu::MutableTextureState state(VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
queue_index);
skgpu::MutableTextureState state =
skgpu::MutableTextureStates::MakeVulkan(
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, queue_index);
GrSemaphoresSubmitted submitted =
gr_context_->flush(sk_surface.get(), flush_info, &state);
CHECK_EQ(GrSemaphoresSubmitted::kYes, submitted);

@ -29,6 +29,7 @@
#include "third_party/skia/include/gpu/MutableTextureState.h"
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
#include "third_party/skia/include/gpu/ganesh/vk/GrVkBackendSemaphore.h"
#include "third_party/skia/include/gpu/vk/VulkanMutableTextureState.h"
#include "third_party/skia/include/private/chromium/GrPromiseImageTexture.h"
#include "ui/gl/gl_utils.h"
@ -305,7 +306,8 @@ SkiaVkAndroidImageRepresentation::GetEndAccessState() {
if ((android_backing()->usage() & ~kSingleDeviceUsage) ||
android_backing()->is_thread_safe()) {
return std::make_unique<skgpu::MutableTextureState>(
VK_IMAGE_LAYOUT_UNDEFINED, vulkan_image_->queue_family_index());
skgpu::MutableTextureStates::MakeVulkan(
VK_IMAGE_LAYOUT_UNDEFINED, vulkan_image_->queue_family_index()));
}
return nullptr;
}

@ -62,30 +62,11 @@ config("skia_config") {
"SK_UNTIL_CRBUG_1187654_IS_FIXED",
"SK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\"",
"SK_WIN_FONTMGR_NO_SIMULATIONS",
"SK_DISABLE_LEGACY_SKSURFACE_METHODS",
"SK_DISABLE_LEGACY_GRAPHITE_IMAGE_FACTORIES",
"SK_DISABLE_LEGACY_GRAPHITE_IMAGE_METHODS",
"SK_DISABLE_LEGACY_SKSURFACE_FACTORIES",
"SK_DISABLE_LEGACY_SKSURFACE_FLUSH",
"SK_DISABLE_LEGACY_SKSURFACE_AS_IMAGE",
"SK_DISABLE_LEGACY_SKSURFACE_DISPLAYLIST",
"SK_DISABLE_LEGACY_IMAGE_SUBSET_METHODS",
"SK_DISABLE_LEGACY_IMAGE_COLORSPACE_METHODS",
"SK_DISABLE_LEGACY_IMAGE_RELEASE_PROCS",
"SK_DISABLE_LEGACY_GL_BACKEND_SURFACE",
"SK_DISABLE_LEGACY_INIT_DECODERS",
"SK_DISABLE_LEGACY_GRDIRECTCONTEXT_FLUSH",
"SK_DISABLE_LEGACY_GRDIRECTCONTEXT_BOOLS",
"SK_DISABLE_LEGACY_GL_GRDIRECTCONTEXT_FACTORIES",
"SK_DISABLE_LEGACY_PNG_WRITEBUFFER",
"SK_SLUG_DISABLE_LEGACY_DESERIALIZE",
"SK_DISABLE_LEGACY_VK_GRDIRECTCONTEXT_FACTORIES",
"SK_DEFAULT_TYPEFACE_IS_EMPTY",
"SK_DISABLE_LEGACY_DEFAULT_TYPEFACE",
"SK_DISABLE_LEGACY_VULKAN_BACKENDSEMAPHORE",
"SK_DISABLE_LEGACY_CREATE_CHARACTERIZATION",
"SK_DISABLE_LEGACY_FONTMGR_REFDEFAULT",
"SK_DISABLE_LEGACY_FONTMGR_FACTORY",
"SK_DISABLE_LEGACY_VULKAN_MUTABLE_TEXTURE_STATE",
]
include_dirs = [
@ -102,11 +83,6 @@ config("skia_config") {
"SK_ENCODE_WEBP",
]
include_dirs += [ "//third_party/wuffs/src/release/c" ]
} else {
# Decoder sources are only added when use_blink == true, but SkCodec.cpp is
# always present. SK_DISABLE_LEGACY_INIT_DECODERS ensures that SkCodec.cpp
# is not attempting to reference inexistent codec code.
defines += [ "SK_DISABLE_LEGACY_INIT_DECODERS" ]
}
if (is_component_build) {

@ -118,11 +118,3 @@ SkFont DefaultFont() {
}
} // namespace skia
// TODO(b/305780908) Remove this after all dependencies on the default fontmgr
// have been removed.
#if !defined(SK_DISABLE_LEGACY_FONTMGR_FACTORY)
SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
return skia::DefaultFontMgr();
}
#endif