chromium/src
0
Fork 0
Code Activity

Fix includes of Chromium-specific Skia headers

Browse Source 
Follow-up to crrev.com/c/4089412 and review.skia.org/628743

Bug: skia:13983
Change-Id: Ied97f41665fe30a99c6284474c1eb5828a9b5df1
Disable-Rts: True
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4163300
Commit-Queue: Kevin Lubick <kjlubick@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: ccameron chromium <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1092390}
This commit is contained in:
Kevin Lubick
2023-01-13 14:35:48 +00:00
committed by Chromium LUCI CQ
parent 2abd2a6cfa
commit 1ff2ebf488
7 changed files with 5 additions and 12 deletions

1
android_webview/DEPS

@ -48,5 +48,4 @@ include_rules = [
# Used for Vulkan interop path. # Used for Vulkan interop path.
"+third_party/vulkan/include", "+third_party/vulkan/include",
"+third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h",
] ]

2
android_webview/browser/gfx/aw_draw_fn_impl.cc

@ -16,7 +16,7 @@
#include "gpu/config/gpu_switches.h" #include "gpu/config/gpu_switches.h"
#include "third_party/skia/include/core/SkRefCnt.h" #include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/gpu/GrDirectContext.h" #include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h" #include "third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h"
#include "ui/gfx/color_space.h" #include "ui/gfx/color_space.h"
using base::android::JavaParamRef; using base::android::JavaParamRef;

3
android_webview/browser/gfx/aw_vulkan_context_provider.h

@ -13,11 +13,10 @@
#include "third_party/skia/include/core/SkRefCnt.h" #include "third_party/skia/include/core/SkRefCnt.h"
#include "third_party/skia/include/core/SkSurfaceCharacterization.h" #include "third_party/skia/include/core/SkSurfaceCharacterization.h"
#include "third_party/skia/include/gpu/GrBackendSemaphore.h" #include "third_party/skia/include/gpu/GrBackendSemaphore.h"
#include "third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h" #include "third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h"
struct AwDrawFn_InitVkParams; struct AwDrawFn_InitVkParams;
class GrDirectContext; class GrDirectContext;
class GrVkSecondaryCBDrawContext;
namespace gpu { namespace gpu {
class VulkanImplementation; class VulkanImplementation;

2
android_webview/browser/gfx/vulkan_gl_interop.cc

@ -20,7 +20,7 @@
#include "third_party/skia/include/gpu/GrBackendSemaphore.h" #include "third_party/skia/include/gpu/GrBackendSemaphore.h"
#include "third_party/skia/include/gpu/vk/GrVkBackendContext.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/GrVkExtensions.h"
#include "third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h" #include "third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h"
#include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/android/egl_fence_utils.h" #include "ui/gl/android/egl_fence_utils.h"
#include "ui/gl/gl_bindings.h" #include "ui/gl/gl_bindings.h"

2
components/viz/service/display_embedder/skia_output_device_vulkan_secondary_cb.cc

@ -11,7 +11,7 @@
#include "third_party/skia/include/core/SkSurfaceCharacterization.h" #include "third_party/skia/include/core/SkSurfaceCharacterization.h"
#include "third_party/skia/include/gpu/GrBackendSurface.h" #include "third_party/skia/include/gpu/GrBackendSurface.h"
#include "third_party/skia/include/gpu/GrDirectContext.h" #include "third_party/skia/include/gpu/GrDirectContext.h"
#include "third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h" #include "third_party/skia/include/private/chromium/GrVkSecondaryCBDrawContext.h"
#include "ui/gfx/presentation_feedback.h" #include "ui/gfx/presentation_feedback.h"
namespace viz { namespace viz {

5
skia/BUILD.gn

@ -547,11 +547,6 @@ component("skia") {
if (enable_vulkan) { if (enable_vulkan) {
public += skia_gpu_vk_public public += skia_gpu_vk_public
public += skia_gpu_vk_chromium_public public += skia_gpu_vk_chromium_public
public += [
# TODO(kjlubick) remove this file once Chrome uses the one from
# skia/include/private/chromium
"//third_party/skia/src/gpu/vk/GrVkSecondaryCBDrawContext.h",
]
sources += skia_gpu_vk_private sources += skia_gpu_vk_private
sources += skia_shared_vk_sources sources += skia_shared_vk_sources
sources += skia_gpu_vk_chromium_private sources += skia_gpu_vk_chromium_private

2
skia/ext/SkDiscardableMemory_chrome.h

@ -7,7 +7,7 @@
#include <memory> #include <memory>
#include "third_party/skia/src/core/SkDiscardableMemory.h" #include "third_party/skia/include/private/chromium/SkDiscardableMemory.h"
namespace base { namespace base {
class DiscardableMemory; class DiscardableMemory;