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

Commit aa0f2c8

Browse files
authored
Roll Skia to 45a00ce and update licenses. (#3569)
1 parent b4088b6 commit aa0f2c8

File tree

4 files changed

+31
-9
lines changed

4 files changed

+31
-9
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ vars = {
2222
'fuchsia_git': 'https://fuchsia.googlesource.com',
2323
'skia_git': 'https://skia.googlesource.com',
2424
'github_git': 'https://github.com',
25-
'skia_revision': '291932e8e42e0556bfef9118231b4ac364ecf5df',
25+
'skia_revision': '45a00cee88c0ea8ea175694cb94b26748713fe36',
2626

2727
# Note: When updating the Dart revision, ensure that all entries that are
2828
# dependencies of dart are also updated

lib/ui/painting/vertices.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ftl::RefPtr<Vertices> Vertices::Create() {
4949
return ftl::MakeRefCounted<Vertices>();
5050
}
5151

52-
void Vertices::init(SkCanvas::VertexMode vertex_mode,
52+
void Vertices::init(SkVertices::VertexMode vertex_mode,
5353
const tonic::Float32List& positions,
5454
const tonic::Float32List& texture_coordinates,
5555
const tonic::Int32List& colors,

lib/ui/painting/vertices.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "lib/tonic/dart_wrappable.h"
99
#include "lib/tonic/typed_data/float32_list.h"
1010
#include "lib/tonic/typed_data/int32_list.h"
11-
#include "third_party/skia/include/core/SkCanvas.h"
1211
#include "third_party/skia/include/core/SkVertices.h"
1312

1413
namespace tonic {
@@ -30,7 +29,7 @@ class Vertices : public ftl::RefCountedThreadSafe<Vertices>,
3029
static ftl::RefPtr<Vertices> Create();
3130

3231
void init(
33-
SkCanvas::VertexMode vertex_mode,
32+
SkVertices::VertexMode vertex_mode,
3433
const tonic::Float32List& positions,
3534
const tonic::Float32List& texture_coordinates,
3635
const tonic::Int32List& colors,

travis/licenses_golden/licenses_third_party

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 0accff0d9e0c1e82795b227e613aa9d7
1+
Signature: eb16bcdb62a7e3822580e28c7514cd52
22

33
UNUSED LICENSES:
44

@@ -50726,11 +50726,14 @@ FILE: ../../../third_party/skia/gm/image.h
5072650726
FILE: ../../../third_party/skia/gm/smallimage.cpp
5072750727
FILE: ../../../third_party/skia/infra/bots/android_bin.isolate
5072850728
FILE: ../../../third_party/skia/infra/bots/android_map.json
50729+
FILE: ../../../third_party/skia/infra/bots/assets.isolate
5072950730
FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION
5073050731
FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_linux/VERSION
5073150732
FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_windows/VERSION
5073250733
FILE: ../../../third_party/skia/infra/bots/assets/android_sdk/VERSION
50734+
FILE: ../../../third_party/skia/infra/bots/assets/armhf_sysroot/VERSION
5073350735
FILE: ../../../third_party/skia/infra/bots/assets/cast_toolchain/VERSION
50736+
FILE: ../../../third_party/skia/infra/bots/assets/chromebook_c100p_lib/VERSION
5073450737
FILE: ../../../third_party/skia/infra/bots/assets/clang_linux/VERSION
5073550738
FILE: ../../../third_party/skia/infra/bots/assets/go/VERSION
5073650739
FILE: ../../../third_party/skia/infra/bots/assets/linux_vulkan_intel_driver_debug/VERSION
@@ -50741,6 +50744,7 @@ FILE: ../../../third_party/skia/infra/bots/assets/skp/VERSION
5074150744
FILE: ../../../third_party/skia/infra/bots/assets/svg/VERSION
5074250745
FILE: ../../../third_party/skia/infra/bots/assets/win_toolchain/VERSION
5074350746
FILE: ../../../third_party/skia/infra/bots/assets/win_vulkan_sdk/VERSION
50747+
FILE: ../../../third_party/skia/infra/bots/bundle_recipes.isolate
5074450748
FILE: ../../../third_party/skia/infra/bots/cfg.json
5074550749
FILE: ../../../third_party/skia/infra/bots/compile_skia.isolate
5074650750
FILE: ../../../third_party/skia/infra/bots/coverage_skia.isolate
@@ -50753,13 +50757,15 @@ FILE: ../../../third_party/skia/infra/bots/infrabots.isolate
5075350757
FILE: ../../../third_party/skia/infra/bots/ios_bin.isolate
5075450758
FILE: ../../../third_party/skia/infra/bots/jobs.json
5075550759
FILE: ../../../third_party/skia/infra/bots/perf_skia.isolate
50760+
FILE: ../../../third_party/skia/infra/bots/perf_skia_bundled.isolate
5075650761
FILE: ../../../third_party/skia/infra/bots/presubmit_skia.isolate
5075750762
FILE: ../../../third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
5075850763
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-arm64-Debug-iOS.json
5075950764
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-mipsel-Debug-GN_Android.json
5076050765
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x64-Release-iOS.json
5076150766
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
5076250767
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Mac-Clang-x86_64-Release-GN.json
50768+
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json
5076350769
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android-Trybot.json
5076450770
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Debug-GN_Android_FrameworkDefs.json
5076550771
FILE: ../../../third_party/skia/infra/bots/recipe_modules/compile/example.expected/Build-Ubuntu-Clang-arm64-Release-GN_Android.json
@@ -50885,6 +50891,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/upload_dm_results/exam
5088550891
FILE: ../../../third_party/skia/infra/bots/recipe_modules/upload_nano_results/example.expected/normal_bot.json
5088650892
FILE: ../../../third_party/skia/infra/bots/recipe_modules/upload_nano_results/example.expected/recipe_with_gerrit_patch.json
5088750893
FILE: ../../../third_party/skia/infra/bots/recipe_modules/upload_nano_results/example.expected/trybot.json
50894+
FILE: ../../../third_party/skia/infra/bots/recipes/bundle_recipes.expected/BundleRecipes.json
5088850895
FILE: ../../../third_party/skia/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
5088950896
FILE: ../../../third_party/skia/infra/bots/recipes/swarm_RecreateSKPs.expected/Housekeeper-Weekly-RecreateSKPs.json
5089050897
FILE: ../../../third_party/skia/infra/bots/recipes/swarm_RecreateSKPs.expected/failed_upload.json
@@ -50917,9 +50924,12 @@ FILE: ../../../third_party/skia/infra/bots/recipes/upload_nano_results.expected/
5091750924
FILE: ../../../third_party/skia/infra/bots/resources.isolate
5091850925
FILE: ../../../third_party/skia/infra/bots/skia_repo.isolate
5091950926
FILE: ../../../third_party/skia/infra/bots/skpbench_skia.isolate
50927+
FILE: ../../../third_party/skia/infra/bots/skpbench_skia_bundled.isolate
5092050928
FILE: ../../../third_party/skia/infra/bots/swarm_recipe.isolate
50929+
FILE: ../../../third_party/skia/infra/bots/swarm_recipe_bundled.isolate
5092150930
FILE: ../../../third_party/skia/infra/bots/tasks.json
5092250931
FILE: ../../../third_party/skia/infra/bots/test_skia.isolate
50932+
FILE: ../../../third_party/skia/infra/bots/test_skia_bundled.isolate
5092350933
FILE: ../../../third_party/skia/infra/bots/tools/luci-go/linux64/isolate.sha1
5092450934
FILE: ../../../third_party/skia/infra/bots/tools/luci-go/mac64/isolate.sha1
5092550935
FILE: ../../../third_party/skia/infra/bots/tools/luci-go/win64/isolate.exe.sha1
@@ -51546,9 +51556,9 @@ FILE: ../../../third_party/skia/src/gpu/GrPathRange.h
5154651556
FILE: ../../../third_party/skia/src/gpu/GrPathRendering.cpp
5154751557
FILE: ../../../third_party/skia/src/gpu/GrPathRendering.h
5154851558
FILE: ../../../third_party/skia/src/gpu/GrPendingProgramElement.h
51549-
FILE: ../../../third_party/skia/src/gpu/GrPipelineAnalysis.cpp
51550-
FILE: ../../../third_party/skia/src/gpu/GrPipelineAnalysis.h
5155151559
FILE: ../../../third_party/skia/src/gpu/GrPrimitiveProcessor.cpp
51560+
FILE: ../../../third_party/skia/src/gpu/GrProcessorAnalysis.cpp
51561+
FILE: ../../../third_party/skia/src/gpu/GrProcessorAnalysis.h
5155251562
FILE: ../../../third_party/skia/src/gpu/GrProgramDesc.h
5155351563
FILE: ../../../third_party/skia/src/gpu/GrRectanizer_pow2.h
5155451564
FILE: ../../../third_party/skia/src/gpu/GrRectanizer_skyline.h
@@ -52670,8 +52680,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5267052680

5267152681
====================================================================================================
5267252682
LIBRARY: skia
52673-
ORIGIN: ../../../third_party/skia/bench/CubicKLMBench.cpp + ../../../third_party/skia/LICENSE
52683+
ORIGIN: ../../../third_party/skia/bench/ColorCanvasDrawBitmapBench.cpp + ../../../third_party/skia/LICENSE
5267452684
TYPE: LicenseType.bsd
52685+
FILE: ../../../third_party/skia/bench/ColorCanvasDrawBitmapBench.cpp
5267552686
FILE: ../../../third_party/skia/bench/CubicKLMBench.cpp
5267652687
FILE: ../../../third_party/skia/fuzz/FuzzCanvas.cpp
5267752688
FILE: ../../../third_party/skia/gm/bitmaptiled.cpp
@@ -52704,9 +52715,13 @@ FILE: ../../../third_party/skia/src/core/SkBitmapProcState_utils.h
5270452715
FILE: ../../../third_party/skia/src/core/SkClipStackDevice.cpp
5270552716
FILE: ../../../third_party/skia/src/core/SkClipStackDevice.h
5270652717
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformCanvas.cpp
52718+
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformer.cpp
52719+
FILE: ../../../third_party/skia/src/core/SkColorSpaceXformer.h
5270752720
FILE: ../../../third_party/skia/src/core/SkExecutor.cpp
5270852721
FILE: ../../../third_party/skia/src/core/SkImageInfoPriv.h
5270952722
FILE: ../../../third_party/skia/src/core/SkRasterClipStack.h
52723+
FILE: ../../../third_party/skia/src/core/SkThreadedBMPDevice.cpp
52724+
FILE: ../../../third_party/skia/src/core/SkThreadedBMPDevice.h
5271052725
FILE: ../../../third_party/skia/src/core/SkUnPreMultiplyPriv.h
5271152726
FILE: ../../../third_party/skia/src/core/SkVertices.cpp
5271252727
FILE: ../../../third_party/skia/src/core/SkWritePixelsRec.h
@@ -52733,12 +52748,20 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkSemaphore.cpp
5273352748
FILE: ../../../third_party/skia/src/gpu/vk/GrVkSemaphore.h
5273452749
FILE: ../../../third_party/skia/src/jumper/SkJumper.cpp
5273552750
FILE: ../../../third_party/skia/src/jumper/SkJumper.h
52736-
FILE: ../../../third_party/skia/src/jumper/SkJumper_generated.cpp
52751+
FILE: ../../../third_party/skia/src/jumper/SkJumper_generated.S
52752+
FILE: ../../../third_party/skia/src/jumper/SkJumper_generated_win.S
52753+
FILE: ../../../third_party/skia/src/jumper/SkJumper_misc.h
5273752754
FILE: ../../../third_party/skia/src/jumper/SkJumper_stages.cpp
52755+
FILE: ../../../third_party/skia/src/jumper/SkJumper_vectors.h
5273852756
FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_directory.cpp
5273952757
FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
5274052758
FILE: ../../../third_party/skia/src/ports/SkFontMgr_custom_empty.cpp
5274152759
FILE: ../../../third_party/skia/src/ports/SkGlobalInitialization_none.cpp
52760+
FILE: ../../../third_party/skia/src/sksl/SkSLFileOutputStream.h
52761+
FILE: ../../../third_party/skia/src/sksl/SkSLOutputStream.h
52762+
FILE: ../../../third_party/skia/src/sksl/SkSLString.cpp
52763+
FILE: ../../../third_party/skia/src/sksl/SkSLString.h
52764+
FILE: ../../../third_party/skia/src/sksl/SkSLStringStream.h
5274252765
FILE: ../../../third_party/skia/src/sksl/ast/SkSLASTSwitchCase.h
5274352766
FILE: ../../../third_party/skia/src/sksl/ast/SkSLASTSwitchStatement.h
5274452767
FILE: ../../../third_party/skia/src/sksl/disable_flex_warnings.h

0 commit comments

Comments
 (0)