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

Commit c135243

Browse files
authored
Add missing includes of GrBackendSurface.h (#42563)
In https://skia-review.googlesource.com/c/skia/+/704942, Skia removed some unnecessary #includes which parts of Flutter had been depending on implicitly. This adds those includes in explicitly. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on writing and running engine tests. - [ ] I updated/added relevant documentation (doc comments with `///`). - [x] I signed the [CLA]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 6d1ed1a commit c135243

File tree

10 files changed

+13
-0
lines changed

10 files changed

+13
-0
lines changed

lib/ui/painting/display_list_deferred_image_gpu_skia.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#include "flutter/lib/ui/io_manager.h"
1818
#include "flutter/lib/ui/snapshot_delegate.h"
1919

20+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
21+
2022
namespace flutter {
2123

2224
class DlDeferredImageGPUSkia final : public DlImage {

lib/web_ui/skwasm/surface.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include "surface.h"
66

7+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
8+
79
using namespace Skwasm;
810

911
Surface::Surface(const char* canvasID) : _canvasID(canvasID) {

shell/common/rasterizer.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "third_party/skia/include/core/SkSerialProcs.h"
2626
#include "third_party/skia/include/core/SkSize.h"
2727
#include "third_party/skia/include/core/SkSurface.h"
28+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
2829
#include "third_party/skia/include/gpu/GrDirectContext.h"
2930
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
3031
#include "third_party/skia/include/utils/SkBase64.h"

shell/gpu/gpu_surface_vulkan.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include "third_party/skia/include/core/SkColorSpace.h"
1111
#include "third_party/skia/include/core/SkSize.h"
1212
#include "third_party/skia/include/core/SkSurface.h"
13+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
14+
#include "third_party/skia/include/gpu/GrDirectContext.h"
1315
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
1416
#include "vulkan/vulkan_core.h"
1517

shell/platform/embedder/embedder.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "third_party/dart/runtime/bin/elf_loader.h"
2121
#include "third_party/dart/runtime/include/dart_native_api.h"
2222
#include "third_party/skia/include/core/SkSurface.h"
23+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
2324
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
2425

2526
#if !defined(FLUTTER_NO_EXPORT)

shell/platform/embedder/tests/embedder_metal_unittests.mm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "flutter/testing/testing.h"
2222

2323
#include "third_party/skia/include/core/SkSurface.h"
24+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
2425
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
2526

2627
// CREATE_NATIVE_ENTRY is leaky by design

shell/platform/embedder/tests/embedder_test_backingstore_producer.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "third_party/skia/include/core/SkImageInfo.h"
1212
#include "third_party/skia/include/core/SkSize.h"
1313
#include "third_party/skia/include/core/SkSurface.h"
14+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
1415
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
1516

1617
#include <cstdlib>

testing/test_gl_surface.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "third_party/skia/include/core/SkColorSpace.h"
1818
#include "third_party/skia/include/core/SkColorType.h"
1919
#include "third_party/skia/include/core/SkSurface.h"
20+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
2021
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
2122
#include "third_party/skia/include/gpu/gl/GrGLAssembleInterface.h"
2223

testing/test_metal_surface_impl.mm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "third_party/skia/include/core/SkRefCnt.h"
1616
#include "third_party/skia/include/core/SkSize.h"
1717
#include "third_party/skia/include/core/SkSurface.h"
18+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
1819
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
1920

2021
namespace flutter {

testing/test_vulkan_surface.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "third_party/skia/include/core/SkColorType.h"
1212
#include "third_party/skia/include/core/SkSurface.h"
1313
#include "third_party/skia/include/core/SkSurfaceProps.h"
14+
#include "third_party/skia/include/gpu/GrBackendSurface.h"
1415
#include "third_party/skia/include/gpu/ganesh/SkSurfaceGanesh.h"
1516

1617
namespace flutter {

0 commit comments

Comments
 (0)