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

Commit 50b93f8

Browse files
Roll src/third_party/skia e2439cc..ebbc82c (8 commits) (#9472)
https://skia.googlesource.com/skia.git /%2Blog/e2439cc929f9..ebbc82c git log e2439cc..ebbc82c --date=short --no-merges --format=%ad %ae %s 2019-06-25 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 dfd7600..3b22559 (3 commits) 2019-06-25 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 91f69e5c58f5..aab9fad64483 (366 commits) 2019-06-25 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 900e1da..e899321 (7 commits) 2019-06-24 mtklein@google.com assemble directly into mmap'd memory 2019-06-24 brianosman@google.com ByteCode: Improved ExternalValue interface 2019-06-24 bsalomon@google.com Trace events in Gr[Vk]Gpu, GrVkCommandBuffer, GrVkCommandPool, and GrVkResoureProvider. 2019-06-24 mtklein@google.com add RP comparison for SkVM_Overhead 2019-06-24 bsalomon@google.com Trace events in GrVkAMDMemoryAllocator 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 (djsollen@google.com), and stop the roller if necessary.
1 parent 2a7a355 commit 50b93f8

File tree

3 files changed

+187
-25
lines changed

3 files changed

+187
-25
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ vars = {
2626
'skia_git': 'https://skia.googlesource.com',
2727
# OCMock is for testing only so there is no google clone
2828
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
29-
'skia_revision': 'e2439cc929f9f049fb7e05cc9f4acfe878fd2583',
29+
'skia_revision': 'ebbc82c02471a2d785136e5261346e906f910561',
3030

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

ci/licenses_golden/licenses_skia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 73ac27d39d7b8d732b64248e4fedd768
1+
Signature: 78e53cf2b76d91a7eddd68be5591d91d
22

33
UNUSED LICENSES:
44

sky/packages/sky_engine/LICENSE

Lines changed: 185 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6005,6 +6005,32 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
60056005
--------------------------------------------------------------------------------
60066006
harfbuzz
60076007

6008+
Copyright © 2007,2008,2009 Red Hat, Inc.
6009+
Copyright © 2012,2013 Google, Inc.
6010+
Copyright © 2019, Facebook Inc.
6011+
6012+
This is part of HarfBuzz, a text shaping library.
6013+
6014+
Permission is hereby granted, without written agreement and without
6015+
license or royalty fees, to use, copy, modify, and distribute this
6016+
software and its documentation for any purpose, provided that the
6017+
above copyright notice and the following two paragraphs appear in
6018+
all copies of this software.
6019+
6020+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
6021+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
6022+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
6023+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
6024+
DAMAGE.
6025+
6026+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
6027+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
6028+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
6029+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
6030+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
6031+
--------------------------------------------------------------------------------
6032+
harfbuzz
6033+
60086034
Copyright © 2007,2008,2009,2010 Red Hat, Inc.
60096035
Copyright © 2010,2012 Google, Inc.
60106036

@@ -6105,6 +6131,32 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
61056131
--------------------------------------------------------------------------------
61066132
harfbuzz
61076133

6134+
Copyright © 2007,2008,2009,2010 Red Hat, Inc.
6135+
Copyright © 2012,2018 Google, Inc.
6136+
Copyright © 2019 Facebook, Inc.
6137+
6138+
This is part of HarfBuzz, a text shaping library.
6139+
6140+
Permission is hereby granted, without written agreement and without
6141+
license or royalty fees, to use, copy, modify, and distribute this
6142+
software and its documentation for any purpose, provided that the
6143+
above copyright notice and the following two paragraphs appear in
6144+
all copies of this software.
6145+
6146+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
6147+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
6148+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
6149+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
6150+
DAMAGE.
6151+
6152+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
6153+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
6154+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
6155+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
6156+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
6157+
--------------------------------------------------------------------------------
6158+
harfbuzz
6159+
61086160
Copyright © 2009 Red Hat, Inc.
61096161

61106162
This is part of HarfBuzz, a text shaping library.
@@ -6702,6 +6754,31 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
67026754
--------------------------------------------------------------------------------
67036755
harfbuzz
67046756

6757+
Copyright © 2011,2012 Google, Inc.
6758+
Copyright © 2018 Ebrahim Byagowi
6759+
6760+
This is part of HarfBuzz, a text shaping library.
6761+
6762+
Permission is hereby granted, without written agreement and without
6763+
license or royalty fees, to use, copy, modify, and distribute this
6764+
software and its documentation for any purpose, provided that the
6765+
above copyright notice and the following two paragraphs appear in
6766+
all copies of this software.
6767+
6768+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
6769+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
6770+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
6771+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
6772+
DAMAGE.
6773+
6774+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
6775+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
6776+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
6777+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
6778+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
6779+
--------------------------------------------------------------------------------
6780+
harfbuzz
6781+
67056782
Copyright © 2011,2012,2013 Google, Inc.
67066783

67076784
This is part of HarfBuzz, a text shaping library.
@@ -6895,7 +6972,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
68956972
--------------------------------------------------------------------------------
68966973
harfbuzz
68976974

6898-
Copyright © 2013 Google, Inc.
6975+
Copyright © 2012,2018 Google, Inc.
68996976

69006977
This is part of HarfBuzz, a text shaping library.
69016978

@@ -6919,7 +6996,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
69196996
--------------------------------------------------------------------------------
69206997
harfbuzz
69216998

6922-
Copyright © 2013 Red Hat, Inc.
6999+
Copyright © 2013 Google, Inc.
69237000

69247001
This is part of HarfBuzz, a text shaping library.
69257002

@@ -6943,7 +7020,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
69437020
--------------------------------------------------------------------------------
69447021
harfbuzz
69457022

6946-
Copyright © 2014 Google, Inc.
7023+
Copyright © 2013 Red Hat, Inc.
69477024

69487025
This is part of HarfBuzz, a text shaping library.
69497026

@@ -6967,7 +7044,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
69677044
--------------------------------------------------------------------------------
69687045
harfbuzz
69697046

6970-
Copyright © 2015 Ebrahim Byagowi
7047+
Copyright © 2014 Google, Inc.
69717048

69727049
This is part of HarfBuzz, a text shaping library.
69737050

@@ -7040,7 +7117,7 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
70407117
--------------------------------------------------------------------------------
70417118
harfbuzz
70427119

7043-
Copyright © 2015-2018 Ebrahim Byagowi
7120+
Copyright © 2015-2019 Ebrahim Byagowi
70447121

70457122
This is part of HarfBuzz, a text shaping library.
70467123

@@ -7165,6 +7242,7 @@ harfbuzz
71657242

71667243
Copyright © 2016 Elie Roux <elie.roux@telecom-bretagne.eu>
71677244
Copyright © 2018 Google, Inc.
7245+
Copyright © 2018 Ebrahim Byagowi
71687246

71697247
This is part of HarfBuzz, a text shaping library.
71707248

@@ -7212,6 +7290,56 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
72127290
--------------------------------------------------------------------------------
72137291
harfbuzz
72147292

7293+
Copyright © 2017 Google, Inc.
7294+
Copyright © 2018 Ebrahim Byagowi
7295+
7296+
This is part of HarfBuzz, a text shaping library.
7297+
7298+
Permission is hereby granted, without written agreement and without
7299+
license or royalty fees, to use, copy, modify, and distribute this
7300+
software and its documentation for any purpose, provided that the
7301+
above copyright notice and the following two paragraphs appear in
7302+
all copies of this software.
7303+
7304+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
7305+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
7306+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
7307+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
7308+
DAMAGE.
7309+
7310+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
7311+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
7312+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
7313+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
7314+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
7315+
--------------------------------------------------------------------------------
7316+
harfbuzz
7317+
7318+
Copyright © 2017 Google, Inc.
7319+
Copyright © 2019 Facebook, Inc.
7320+
7321+
This is part of HarfBuzz, a text shaping library.
7322+
7323+
Permission is hereby granted, without written agreement and without
7324+
license or royalty fees, to use, copy, modify, and distribute this
7325+
software and its documentation for any purpose, provided that the
7326+
above copyright notice and the following two paragraphs appear in
7327+
all copies of this software.
7328+
7329+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
7330+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
7331+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
7332+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
7333+
DAMAGE.
7334+
7335+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
7336+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
7337+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
7338+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
7339+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
7340+
--------------------------------------------------------------------------------
7341+
harfbuzz
7342+
72157343
Copyright © 2017,2018 Google, Inc.
72167344

72177345
This is part of HarfBuzz, a text shaping library.
@@ -7358,7 +7486,56 @@ PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
73587486
--------------------------------------------------------------------------------
73597487
harfbuzz
73607488

7361-
Copyright © 2018 Adobe Systems Incorporated.
7489+
Copyright © 2018 Google, Inc.
7490+
Copyright © 2019 Facebook, Inc.
7491+
7492+
This is part of HarfBuzz, a text shaping library.
7493+
7494+
Permission is hereby granted, without written agreement and without
7495+
license or royalty fees, to use, copy, modify, and distribute this
7496+
software and its documentation for any purpose, provided that the
7497+
above copyright notice and the following two paragraphs appear in
7498+
all copies of this software.
7499+
7500+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
7501+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
7502+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
7503+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
7504+
DAMAGE.
7505+
7506+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
7507+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
7508+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
7509+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
7510+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
7511+
--------------------------------------------------------------------------------
7512+
harfbuzz
7513+
7514+
Copyright © 2018 Adobe Inc.
7515+
7516+
This is part of HarfBuzz, a text shaping library.
7517+
7518+
Permission is hereby granted, without written agreement and without
7519+
license or royalty fees, to use, copy, modify, and distribute this
7520+
software and its documentation for any purpose, provided that the
7521+
above copyright notice and the following two paragraphs appear in
7522+
all copies of this software.
7523+
7524+
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
7525+
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
7526+
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
7527+
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
7528+
DAMAGE.
7529+
7530+
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
7531+
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
7532+
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
7533+
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
7534+
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
7535+
--------------------------------------------------------------------------------
7536+
harfbuzz
7537+
7538+
Copyright © 2019 Facebook, Inc.
73627539

73637540
This is part of HarfBuzz, a text shaping library.
73647541

@@ -7386,7 +7563,8 @@ HarfBuzz is licensed under the so-called "Old MIT" license. Details follow.
73867563
For parts of HarfBuzz that are licensed under different licenses see individual
73877564
files names COPYING in subdirectories where applicable.
73887565

7389-
Copyright © 2010,2011,2012 Google, Inc.
7566+
Copyright © 2010,2011,2012,2013,2014,2015,2016,2017,2018,2019 Google, Inc.
7567+
Copyright © 2019 Facebook, Inc.
73907568
Copyright © 2012 Mozilla Foundation
73917569
Copyright © 2011 Codethink Limited
73927570
Copyright © 2008,2010 Nokia Corporation and/or its subsidiary(-ies)
@@ -7418,22 +7596,6 @@ FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
74187596
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
74197597
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
74207598
--------------------------------------------------------------------------------
7421-
harfbuzz
7422-
7423-
The contents of this directory are licensed under the following terms:
7424-
7425-
Permission to use, copy, modify, and/or distribute this software for any
7426-
purpose with or without fee is hereby granted, provided that the above
7427-
copyright notice and this permission notice appear in all copies.
7428-
7429-
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
7430-
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
7431-
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
7432-
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
7433-
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
7434-
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
7435-
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
7436-
--------------------------------------------------------------------------------
74377599
icu
74387600

74397601
Copyright (c) 1995-2016 International Business Machines Corporation and others

0 commit comments

Comments
 (0)