Skip to content

Commit b8e7678

Browse files
skia-flutter-autorollskia-flutter-autoroll
authored
Roll src/third_party/skia 988f54e4689b..ad5f06949033 (102 commits) (flutter#6960)
https://skia.googlesource.com/skia.git/+log/988f54e4689b..ad5f06949033 Created with: gclient setdep -r src/third_party/skia@ad5f06949033 The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary.
1 parent f804a1f commit b8e7678

File tree

3 files changed

+10
-74
lines changed

3 files changed

+10
-74
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vars = {
2323
'fuchsia_git': 'https://fuchsia.googlesource.com',
2424
'github_git': 'https://github.com',
2525
'skia_git': 'https://skia.googlesource.com',
26-
'skia_revision': '988f54e4689b3d9fb6d5220e02b418f5cfa2b6db',
26+
'skia_revision': 'ad5f069490332881eab0697c5c06807f5f89d865',
2727

2828
# When updating the Dart revision, ensure that all entries that are
2929
# dependencies of Dart are also updated to match the entries in the

‎ci/licenses_golden/licenses_skia‎

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: ee0a1574bb6026ffa4292566b01d932d
1+
Signature: 03ade9bd1ada22cf66f97d26b1b89935
22

33
UNUSED LICENSES:
44

@@ -795,7 +795,6 @@ FILE: ../../../third_party/skia/gm/drawregionmodes.cpp
795795
FILE: ../../../third_party/skia/gm/encode-platform.cpp
796796
FILE: ../../../third_party/skia/gm/encode-srgb.cpp
797797
FILE: ../../../third_party/skia/gm/filterbug.cpp
798-
FILE: ../../../third_party/skia/gm/gamut.cpp
799798
FILE: ../../../third_party/skia/gm/hardstop_gradients.cpp
800799
FILE: ../../../third_party/skia/gm/imagemakewithfilter.cpp
801800
FILE: ../../../third_party/skia/gm/imagemasksubset.cpp
@@ -830,7 +829,6 @@ FILE: ../../../third_party/skia/include/effects/SkArithmeticImageFilter.h
830829
FILE: ../../../third_party/skia/include/effects/SkOverdrawColorFilter.h
831830
FILE: ../../../third_party/skia/include/effects/SkPaintImageFilter.h
832831
FILE: ../../../third_party/skia/include/gpu/vk/GrVkBackendContext.h
833-
FILE: ../../../third_party/skia/include/gpu/vk/GrVkDefines.h
834832
FILE: ../../../third_party/skia/include/gpu/vk/GrVkExtensions.h
835833
FILE: ../../../third_party/skia/include/gpu/vk/GrVkTypes.h
836834
FILE: ../../../third_party/skia/include/ports/SkFontMgr_FontConfigInterface.h
@@ -1281,7 +1279,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12811279
====================================================================================================
12821280
LIBRARY: skcms
12831281
LIBRARY: skia
1284-
LIBRARY: vulkan
12851282
LIBRARY: vulkanmemoryallocator
12861283
LIBRARY: wuffs
12871284
ORIGIN: ../../../third_party/skia/bench/ClearBench.cpp + ../../../third_party/skia/LICENSE
@@ -1612,6 +1609,7 @@ FILE: ../../../third_party/skia/src/gpu/vk/GrVkImageLayout.h
16121609
FILE: ../../../third_party/skia/src/gpu/vk/GrVkPipelineLayout.cpp
16131610
FILE: ../../../third_party/skia/src/gpu/vk/GrVkPipelineLayout.h
16141611
FILE: ../../../third_party/skia/src/gpu/vk/GrVkTypesPriv.cpp
1612+
FILE: ../../../third_party/skia/src/gpu/vk/GrVkVulkan.h
16151613
FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.cpp
16161614
FILE: ../../../third_party/skia/src/image/SkImage_GpuBase.h
16171615
FILE: ../../../third_party/skia/src/image/SkImage_GpuYUVA.cpp
@@ -1647,7 +1645,6 @@ FILE: ../../../third_party/skia/third_party/skcms/skcms.cc
16471645
FILE: ../../../third_party/skia/third_party/skcms/skcms.h
16481646
FILE: ../../../third_party/skia/third_party/skcms/skcms_internal.h
16491647
FILE: ../../../third_party/skia/third_party/skcms/src/Transform_inl.h
1650-
FILE: ../../../third_party/skia/third_party/vulkan/SkiaVulkan.h
16511648
FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp
16521649
FILE: ../../../third_party/skia/third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.h
16531650
FILE: ../../../third_party/skia/third_party/wuffs/wuffs.c
@@ -2036,9 +2033,11 @@ FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/example.html
20362033
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/node.example.js
20372034
FILE: ../../../third_party/skia/experimental/canvaskit/canvaskit/package.json
20382035
FILE: ../../../third_party/skia/experimental/canvaskit/cpu.js
2036+
FILE: ../../../third_party/skia/experimental/canvaskit/debug.js
20392037
FILE: ../../../third_party/skia/experimental/canvaskit/externs.js
20402038
FILE: ../../../third_party/skia/experimental/canvaskit/gpu.js
20412039
FILE: ../../../third_party/skia/experimental/canvaskit/helper.js
2040+
FILE: ../../../third_party/skia/experimental/canvaskit/htmlcanvas/_namedcolors.js
20422041
FILE: ../../../third_party/skia/experimental/canvaskit/htmlcanvas/canvas2d.js
20432042
FILE: ../../../third_party/skia/experimental/canvaskit/interface.js
20442043
FILE: ../../../third_party/skia/experimental/canvaskit/karma.bench.conf.js
@@ -2049,6 +2048,7 @@ FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/confetti.json
20492048
FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/drinks.json
20502049
FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/lego_loader.json
20512050
FILE: ../../../third_party/skia/experimental/canvaskit/perf/assets/onboarding.json
2051+
FILE: ../../../third_party/skia/experimental/canvaskit/release.js
20522052
FILE: ../../../third_party/skia/experimental/docs/animationCommon.js
20532053
FILE: ../../../third_party/skia/experimental/docs/backend.js
20542054
FILE: ../../../third_party/skia/experimental/docs/canvasBackend.js
@@ -2197,8 +2197,10 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.exp
21972197
FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
21982198
FILE: ../../../third_party/skia/infra/bots/recipe_modules/vars/examples/full.expected/win_test.json
21992199
FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_nontrybot.json
2200+
FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_sdk_trybot.json
22002201
FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot.json
22012202
FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
2203+
FILE: ../../../third_party/skia/infra/bots/recipes/android_compile.expected/android_compile_unrecognized_target.json
22022204
FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_bookmaker.json
22032205
FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_failed_extract_fiddles.json
22042206
FILE: ../../../third_party/skia/infra/bots/recipes/bookmaker.expected/nightly_failed_fiddlecli.json
@@ -3092,6 +3094,7 @@ FILE: ../../../third_party/skia/src/c/sk_surface.cpp
30923094
FILE: ../../../third_party/skia/src/core/SkBBHFactory.cpp
30933095
FILE: ../../../third_party/skia/src/core/SkBitmapCache.cpp
30943096
FILE: ../../../third_party/skia/src/core/SkBitmapCache.h
3097+
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrix_neon.h
30953098
FILE: ../../../third_party/skia/src/core/SkCachedData.cpp
30963099
FILE: ../../../third_party/skia/src/core/SkCachedData.h
30973100
FILE: ../../../third_party/skia/src/core/SkCanvasPriv.h
@@ -3186,7 +3189,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/GrDashOp.h
31863189
FILE: ../../../third_party/skia/src/gpu/ops/GrSmallPathRenderer.h
31873190
FILE: ../../../third_party/skia/src/image/SkReadPixelsRec.h
31883191
FILE: ../../../third_party/skia/src/image/SkSurface_Gpu.h
3189-
FILE: ../../../third_party/skia/src/opts/SkBitmapProcState_matrix_neon.h
31903192
FILE: ../../../third_party/skia/src/pathops/SkOpBuilder.cpp
31913193
FILE: ../../../third_party/skia/src/pathops/SkOpSpan.cpp
31923194
FILE: ../../../third_party/skia/src/pathops/SkPathOpsTSect.cpp
@@ -5825,41 +5827,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
58255827
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
58265828
====================================================================================================
58275829

5828-
====================================================================================================
5829-
LIBRARY: skia
5830-
ORIGIN: ../../../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp + ../../../third_party/skia/LICENSE
5831-
TYPE: LicenseType.bsd
5832-
FILE: ../../../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
5833-
----------------------------------------------------------------------------------------------------
5834-
Copyright 2009 Motorola
5835-
5836-
Redistribution and use in source and binary forms, with or without
5837-
modification, are permitted provided that the following conditions are
5838-
met:
5839-
5840-
* Redistributions of source code must retain the above copyright
5841-
notice, this list of conditions and the following disclaimer.
5842-
* Redistributions in binary form must reproduce the above
5843-
copyright notice, this list of conditions and the following disclaimer
5844-
in the documentation and/or other materials provided with the
5845-
distribution.
5846-
* Neither the name of Google Inc. nor the names of its
5847-
contributors may be used to endorse or promote products derived from
5848-
this software without specific prior written permission.
5849-
5850-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5851-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5852-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5853-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5854-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5855-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5856-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5857-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5858-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5859-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5860-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5861-
====================================================================================================
5862-
58635830
====================================================================================================
58645831
LIBRARY: skia
58655832
ORIGIN: ../../../third_party/skia/src/ports/SkFontConfigInterface_direct.cpp + ../../../third_party/skia/LICENSE
@@ -6016,4 +5983,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
60165983
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
60175984
THE SOFTWARE.
60185985
====================================================================================================
6019-
Total license count: 53
5986+
Total license count: 52

‎sky/packages/sky_engine/LICENSE‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9611,7 +9611,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
96119611
--------------------------------------------------------------------------------
96129612
skcms
96139613
skia
9614-
vulkan
96159614
vulkanmemoryallocator
96169615
wuffs
96179616

@@ -9955,36 +9954,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99559954
--------------------------------------------------------------------------------
99569955
skia
99579956

9958-
Copyright 2009 Motorola
9959-
9960-
Redistribution and use in source and binary forms, with or without
9961-
modification, are permitted provided that the following conditions are
9962-
met:
9963-
9964-
* Redistributions of source code must retain the above copyright
9965-
notice, this list of conditions and the following disclaimer.
9966-
* Redistributions in binary form must reproduce the above
9967-
copyright notice, this list of conditions and the following disclaimer
9968-
in the documentation and/or other materials provided with the
9969-
distribution.
9970-
* Neither the name of Google Inc. nor the names of its
9971-
contributors may be used to endorse or promote products derived from
9972-
this software without specific prior written permission.
9973-
9974-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
9975-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
9976-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
9977-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
9978-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
9979-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
9980-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
9981-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
9982-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
9983-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
9984-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9985-
--------------------------------------------------------------------------------
9986-
skia
9987-
99889957
Copyright 2009 The Android Open Source Project
99899958

99909959
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)