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

[Multiwindow, macOS] FlutterCompositor::Present receives view_id #37391

Merged
dkwingsmt merged 5 commits into from
Nov 15, 2022
Merged

[Multiwindow, macOS] FlutterCompositor::Present receives view_id #37391

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e9da76
Impl and test
dkwingsmt Nov 7, 2022
2f90ef4
Change to default view
dkwingsmt Nov 8, 2022
d0ecdef
Merge remote-tracking branch 'origin/main' into propagate-compositor-…
dkwingsmt Nov 9, 2022
0394497
Merge remote-tracking branch 'origin/main' into propagate-compositor-…
dkwingsmt Nov 14, 2022
daa57b7
Merge remote-tracking branch 'origin/main' into propagate-compositor-…
dkwingsmt Nov 14, 2022
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into propagate-compositor-… 
…to-engine
  • Loading branch information
@dkwingsmt
dkwingsmt committed Nov 9, 2022
commit d0ecdefdef398facc18c05b6dc1540bfb9e47682
12 changes: 7 additions & 5 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ targets:
add_recipes_cq: "true"
cores: "32"
gcs_goldens_bucket: flutter_logs
gclient_custom_vars: >-
{"download_emsdk": True}
gclient_variables: >-
{"download_emsdk": true}
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
Expand Down Expand Up @@ -409,8 +409,8 @@ targets:
properties:
add_recipes_cq: "true"
gcs_goldens_bucket: flutter_logs
gclient_custom_vars: >-
{"download_emsdk": True}
gclient_variables: >-
{"download_emsdk": true}
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
Expand Down Expand Up @@ -467,13 +467,15 @@ targets:
bringup: true
timeout: 60
properties:
release_build: "true"
config_name: windows_android_aot_engine

- name: Windows windows_host_engine
recipe: engine_v2/engine_v2
bringup: true
timeout: 60
properties:
release_build: "true"
config_name: windows_host_engine

- name: Windows Unopt
Expand All @@ -485,7 +487,7 @@ targets:
- name: Windows Web Engine
recipe: engine/web_engine
properties:
gclient_custom_vars: >-
gclient_variables: >-
{"download_emsdk": true}
gcs_goldens_bucket: flutter_logs
timeout: 60
Expand Down
3 changes: 2 additions & 1 deletion .clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ clang-analyzer-*,\
readability-identifier-naming,\
clang-diagnostic-*,\
google-objc-*,\
google-explicit-constructor"
google-explicit-constructor,\
performance-unnecessary-value-param"

CheckOptions:
- key: modernize-use-default-member-init.UseAssignment
Expand Down
30 changes: 15 additions & 15 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': 'da9fad017aeeb963e15165f6bf934cfeaefbdd28',
'skia_revision': '0854badd5783483a6334d993302e81c12b510622',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
'canvaskit_cipd_instance': 'C478RsheZD4Fqp1fStMPwFWnSz7nfhh7LMFsrU8M4dQC',
'canvaskit_cipd_instance': 'ztaLvbs5GPmlAwUosC7VVp7EQnNVknRpNuKdv7vmzaAC',

# Do not download the Emscripten SDK by default.
# This prevents us from downloading the Emscripten toolchain for builds
Expand All @@ -48,7 +48,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': 'd97d5ad9889378e70f9803f8bf1ba3e0781ab1b8',
'dart_revision': 'fa6586382e5ddcae7fc4fa884584a12ab5e019f7',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand All @@ -59,10 +59,10 @@ vars = {
'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
'dart_devtools_rev': '23444af89d716818f099974df3e4fffac87fd886',
'dart_protobuf_rev': 'ba29983968de5b54196c6c2a5cff1afbdda24ae2',
'dart_pub_rev': '6506cc01b1bd17aff782037817d86a88a1c312e8',
'dart_pub_rev': '65c7f3e528f3f9978c4330cbd471070f17370f65',
'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
'dart_webdev_rev': '069b87091b0cd25ae1a5e5927cdf6a475fda5bf7',
'dart_webdev_rev': '47c1c3317da20dc2cfb542aeafcd04a0f1f381f1',
'dart_webkit_inspection_protocol_rev': 'b825c8f6a12200d619729903207ac826cce278da',
'dart_yaml_edit_rev': '01589b3ce447b03aed991db49f1ec6445ad5476d',
'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
Expand Down Expand Up @@ -210,7 +210,7 @@ deps = {
Var('dart_git') + '/convert.git@4feeb10d2f26d22eab461469da0739a57d001edf',

'src/third_party/dart/third_party/pkg/crypto':
Var('dart_git') + '/crypto.git@7cf89d35b3d90786d9f7f75211b3b3cd7e4d173f',
Var('dart_git') + '/crypto.git@e175a95619ce23bfbd2ab34a4066f86aa0c108db',

'src/third_party/dart/third_party/pkg/csslib':
Var('dart_git') + '/csslib.git@ba2eb2d80530eedefadaade338a09c2dd60410f3',
Expand All @@ -219,19 +219,19 @@ deps = {
Var('dart_git') + '/dart_style.git@f79a9828ad07e50d6e8352ac154cc16eb4d78d5c',

'src/third_party/dart/third_party/pkg/dartdoc':
Var('dart_git') + '/dartdoc.git@179ada02c1bf8e0d69c3255c49742c7513e33f6f',
Var('dart_git') + '/dartdoc.git@4b2e01b6e8c7c4e5e365026c182006b9616ecc28',

'src/third_party/dart/third_party/pkg/ffi':
Var('dart_git') + '/ffi.git@fb5f2667826c0900e551d19101052f84e35f41bf',

'src/third_party/dart/third_party/pkg/file':
Var('dart_git') + '/external/github.com/google/file.dart@b2e31cb6ef40b223701dbfa0b907fe58468484d7',
Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',

'src/third_party/dart/third_party/pkg/fixnum':
Var('dart_git') + '/fixnum.git@e0b17cc1f639c55a9c24947392c64b5a68992535',

'src/third_party/dart/third_party/pkg/glob':
Var('dart_git') + '/glob.git@073007c5d00822a0ddc964c027785d1eb5559d68',
Var('dart_git') + '/glob.git@7f97bf5be6bfe8c90a92283e4c590dba2a676083',

'src/third_party/dart/third_party/pkg/html':
Var('dart_git') + '/html.git@0bf601959ac98e6cdf1925a1cdab70bd6a5ddc45',
Expand All @@ -249,13 +249,13 @@ deps = {
Var('dart_git') + '/json_rpc_2.git@805e6536dd961d66f6b8cd46d8f3e61774f957c9',

'src/third_party/dart/third_party/pkg/linter':
Var('dart_git') + '/linter.git@f2c55484e8ebda0aec8c2fea637b3bd5b17258ca',
Var('dart_git') + '/linter.git@657fa6d60373c144777ddb3ca0ab6ee7805ea2b3',

'src/third_party/dart/third_party/pkg/logging':
Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',

'src/third_party/dart/third_party/pkg/markdown':
Var('dart_git') + '/markdown.git@f3873403f5b1a0319f78632a8fbc2b22315a7b83',
Var('dart_git') + '/markdown.git@9ff4a9f1d37c763f827084ba28a3d0bfec6b5d67',

'src/third_party/dart/third_party/pkg/matcher':
Var('dart_git') + '/matcher.git@6a9b83bbd73e50df2058b3e8e4aa301df49569c6',
Expand Down Expand Up @@ -288,7 +288,7 @@ deps = {
Var('dart_git') + '/pub_semver.git@28159b8c5b96fc2709d0904389d7932880f68659',

'src/third_party/dart/third_party/pkg/shelf':
Var('dart_git') + '/shelf.git@592656f9f5af6392509e9ff20a035fd30e5e5099',
Var('dart_git') + '/shelf.git@5fd2593d47120232054ebcc794f3a028d903f1f8',

'src/third_party/dart/third_party/pkg/source_map_stack_trace':
Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
Expand All @@ -315,7 +315,7 @@ deps = {
Var('dart_git') + '/term_glyph.git@ec7cf7bb51ebb7d55760a1359f6697690dbc06ba',

'src/third_party/dart/third_party/pkg/test':
Var('dart_git') + '/test.git@173a36f2cd4fbf1b2309a87722664d802c74009b',
Var('dart_git') + '/test.git@f3fb3ab6a6e6068b2daaed95ca13e526238def26',

'src/third_party/dart/third_party/pkg/test_reflective_loader':
Var('dart_git') + '/test_reflective_loader.git@ef934b7a894d78601ba67d8f6207bd4505690456',
Expand Down Expand Up @@ -415,7 +415,7 @@ deps = {
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',

'src/third_party/expat':
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + 'a28238bdeebc087071777001245df1876a11f5ee',
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '654d2de0da85662fcc7644a7acd7c2dd2cfb21f0',

'src/third_party/freetype2':
Var('flutter_git') + '/third_party/freetype2' + '@' + '3bea2761290a1cbe7d8f75c1c5a7ad727f826a66',
Expand Down Expand Up @@ -686,7 +686,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/mac-amd64',
'version': '5XOj9l5e2wkSpMKT1pLJGtq9_UAQkHV13y-kg9rVNiUC'
'version': 'vEw8iuSZYmlfk1JiEWg8Yb4_sN9PaX30Wdx8TfWyitEC'
}
],
'condition': 'host_os == "mac" and not download_fuchsia_sdk',
Expand Down
19 changes: 2 additions & 17 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,7 @@ FILE: ../../../flutter/impeller/compiler/spirv_sksl.cc
FILE: ../../../flutter/impeller/compiler/spirv_sksl.h
FILE: ../../../flutter/impeller/compiler/switches.cc
FILE: ../../../flutter/impeller/compiler/switches.h
FILE: ../../../flutter/impeller/compiler/switches_unittests.cc
FILE: ../../../flutter/impeller/compiler/types.cc
FILE: ../../../flutter/impeller/compiler/types.h
FILE: ../../../flutter/impeller/compiler/utilities.cc
Expand Down Expand Up @@ -2588,8 +2589,6 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/Accessibilit
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterAppDelegate.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStore.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStoreData.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterBackingStoreData.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponder.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterChannelKeyResponderUnittests.mm
Expand All @@ -2606,16 +2605,8 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngin
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine_Internal.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureGL.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureGL.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureMetal.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterExternalTextureMetal.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterFrameBufferProvider.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterFrameBufferProvider.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterFrameBufferProviderUnittests.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterGLCompositorUnittests.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterIOSurfaceHolder.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterKeyPrimaryResponder.h
Expand All @@ -2637,18 +2628,13 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetal
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMetalSurfaceManagerTest.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterMouseCursorPlugin.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterOpenGLRenderer.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterOpenGLRendererTest.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMac.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformNodeDelegateMacTest.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewController.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterPlatformViewControllerTest.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderingBackend.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderingBackend.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizableBackingStoreProvider.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterResizeSynchronizer.h
Expand Down Expand Up @@ -2676,8 +2662,6 @@ FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewE
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/FlutterViewProvider.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap.g.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/KeyCodeMap_Internal.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/MacOSGLContextSwitch.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/MacOSGLContextSwitch.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.h
FILE: ../../../flutter/shell/platform/darwin/macos/framework/Source/TestFlutterPlatformView.mm
FILE: ../../../flutter/shell/platform/darwin/macos/framework/module.modulemap
Expand Down Expand Up @@ -3115,6 +3099,7 @@ FILE: ../../../flutter/shell/platform/windows/external_texture_d3d.cc
FILE: ../../../flutter/shell/platform/windows/external_texture_d3d.h
FILE: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.cc
FILE: ../../../flutter/shell/platform/windows/external_texture_pixelbuffer.h
FILE: ../../../flutter/shell/platform/windows/flutter_desktop_messenger.h
FILE: ../../../flutter/shell/platform/windows/flutter_key_map.g.cc
FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.cc
FILE: ../../../flutter/shell/platform/windows/flutter_platform_node_delegate_windows.h
Expand Down
15 changes: 4 additions & 11 deletions ci/licenses_golden/licenses_skia
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: caea015a5969a864f79bdf7198a6251d
Signature: d9d994d2d55d0e2a6e7d5fdbd87cb387

UNUSED LICENSES:

Expand Down Expand Up @@ -526,6 +526,7 @@ FILE: ../../../third_party/skia/OWNERS.android
FILE: ../../../third_party/skia/WORKSPACE.bazel
FILE: ../../../third_party/skia/bench/microbench.json
FILE: ../../../third_party/skia/bench/skpbench.json
FILE: ../../../third_party/skia/defines.bzl
FILE: ../../../third_party/skia/demos.skia.org/demos/hello_world/index.html
FILE: ../../../third_party/skia/demos.skia.org/demos/image_decode_web_worker/index.html
FILE: ../../../third_party/skia/demos.skia.org/demos/image_decode_web_worker/main.js
Expand Down Expand Up @@ -2037,7 +2038,6 @@ FILE: ../../../third_party/skia/include/private/SkTArray.h
FILE: ../../../third_party/skia/include/utils/SkNWayCanvas.h
FILE: ../../../third_party/skia/include/utils/mac/SkCGUtils.h
FILE: ../../../third_party/skia/samplecode/Sample.h
FILE: ../../../third_party/skia/samplecode/SampleArc.cpp
FILE: ../../../third_party/skia/samplecode/SampleCamera.cpp
FILE: ../../../third_party/skia/samplecode/SampleClip.cpp
FILE: ../../../third_party/skia/samplecode/SampleDegenerateTwoPtRadials.cpp
Expand Down Expand Up @@ -2333,8 +2333,6 @@ FILE: ../../../third_party/skia/include/private/SkChecksum.h
FILE: ../../../third_party/skia/include/private/SkPathRef.h
FILE: ../../../third_party/skia/include/private/SkWeakRefCnt.h
FILE: ../../../third_party/skia/include/utils/SkNullCanvas.h
FILE: ../../../third_party/skia/samplecode/SampleAnimBlur.cpp
FILE: ../../../third_party/skia/samplecode/SampleFatBits.cpp
FILE: ../../../third_party/skia/samplecode/SampleQuadStroker.cpp
FILE: ../../../third_party/skia/src/codec/SkColorTable.h
FILE: ../../../third_party/skia/src/core/SkAnnotation.cpp
Expand Down Expand Up @@ -2636,7 +2634,6 @@ FILE: ../../../third_party/skia/include/private/gpu/ganesh/GrTypesPriv.h
FILE: ../../../third_party/skia/include/utils/SkCanvasStateUtils.h
FILE: ../../../third_party/skia/samplecode/SampleChart.cpp
FILE: ../../../third_party/skia/samplecode/SampleClock.cpp
FILE: ../../../third_party/skia/samplecode/SampleManyRects.cpp
FILE: ../../../third_party/skia/samplecode/SampleStringArt.cpp
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.cpp
FILE: ../../../third_party/skia/src/core/SkBitmapDevice.h
Expand Down Expand Up @@ -3179,8 +3176,6 @@ FILE: ../../../third_party/skia/include/private/SkTHash.h
FILE: ../../../third_party/skia/include/private/SkThreadID.h
FILE: ../../../third_party/skia/include/svg/SkSVGCanvas.h
FILE: ../../../third_party/skia/include/utils/SkPaintFilterCanvas.h
FILE: ../../../third_party/skia/samplecode/SampleAnimatedText.cpp
FILE: ../../../third_party/skia/samplecode/SampleAtlas.cpp
FILE: ../../../third_party/skia/samplecode/SampleShip.cpp
FILE: ../../../third_party/skia/samplecode/SampleXfer.cpp
FILE: ../../../third_party/skia/src/codec/SkAndroidCodec.cpp
Expand Down Expand Up @@ -3333,8 +3328,6 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkGpu.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkGpu.h
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImage.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkImage.h
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkMemory.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkMemory.h
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderPass.h
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkRenderTarget.cpp
Expand All @@ -3347,6 +3340,8 @@ FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUtil.cpp
FILE: ../../../third_party/skia/src/gpu/ganesh/vk/GrVkUtil.h
FILE: ../../../third_party/skia/src/gpu/vk/VulkanInterface.cpp
FILE: ../../../third_party/skia/src/gpu/vk/VulkanInterface.h
FILE: ../../../third_party/skia/src/gpu/vk/VulkanMemory.cpp
FILE: ../../../third_party/skia/src/gpu/vk/VulkanMemory.h
FILE: ../../../third_party/skia/src/image/SkImage_Gpu.h
FILE: ../../../third_party/skia/src/image/SkImage_Lazy.cpp
FILE: ../../../third_party/skia/src/opts/SkBlitMask_opts.h
Expand Down Expand Up @@ -3640,7 +3635,6 @@ FILE: ../../../third_party/skia/modules/svg/src/SkSVGTransformableNode.cpp
FILE: ../../../third_party/skia/modules/svg/src/SkSVGValue.cpp
FILE: ../../../third_party/skia/samplecode/DecodeFile.h
FILE: ../../../third_party/skia/samplecode/Sample.cpp
FILE: ../../../third_party/skia/samplecode/SampleAndroidShadows.cpp
FILE: ../../../third_party/skia/samplecode/SampleMegaStroke.cpp
FILE: ../../../third_party/skia/samplecode/SamplePathOverstroke.cpp
FILE: ../../../third_party/skia/samplecode/SampleSVGFile.cpp
Expand Down Expand Up @@ -4444,7 +4438,6 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGPlane.cpp
FILE: ../../../third_party/skia/modules/sksg/src/SkSGScene.cpp
FILE: ../../../third_party/skia/modules/sksg/src/SkSGText.cpp
FILE: ../../../third_party/skia/modules/skshaper/src/SkShaper.cpp
FILE: ../../../third_party/skia/samplecode/SampleAnimatedImage.cpp
FILE: ../../../third_party/skia/samplecode/SampleCusp.cpp
FILE: ../../../third_party/skia/samplecode/SampleFlutterAnimate.cpp
FILE: ../../../third_party/skia/samplecode/SampleGlyphTransform.cpp
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.