Skip to content

Commit fdf57a6

Browse files
Roll src/third_party/skia 429251513f71..2fc1474f9d62 (8 commits) (flutter#7721)
https://skia.googlesource.com/skia.git/%2Blog/429251513f71..2fc1474f9d62 git log 429251513f716de18e9c4ebda05f304eb97fedde..2fc1474f9d62db4b854fd4e5af322f41a323ffe5 --date=short --no-merges --format=%ad %ae %s 2019-02-06 bungeman@google.com Add BOT/EOT to Shaper. 2019-02-06 halcanary@google.com bin/gn format gn/skia.gni 2019-02-06 herb@google.com Remove the distinction between key and device descriptors 2019-02-06 bungeman@google.com Roll HarfBuzz 2019-02-06 halcanary@google.com SkLoadICU: simplify 2019-02-06 robertphillips@google.com Move GrContextPriv methods to their own .cpp file 2019-02-06 mtklein@google.com add mad() and shuffle() to SkVx 2019-02-05 csmartdalton@google.com Add a GpuGM class for GPU-only tests 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 (fmalita@google.com), and stop the roller if necessary.
1 parent 77b3186 commit fdf57a6

File tree

2 files changed

+4
-122
lines changed

2 files changed

+4
-122
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': '429251513f716de18e9c4ebda05f304eb97fedde',
26+
'skia_revision': '2fc1474f9d62db4b854fd4e5af322f41a323ffe5',
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: 3 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 7eb43a71ab47ddd84407142d2b672c29
1+
Signature: a7e934aefd676fac1ba45d5773925b60
22

33
UNUSED LICENSES:
44

@@ -392,125 +392,6 @@ See the License for the specific language governing permissions and
392392
limitations under the License.
393393
====================================================================================================
394394

395-
====================================================================================================
396-
LIBRARY: harfbuzz
397-
ORIGIN: ../../../third_party/skia/third_party/harfbuzz/hb-buffer-deserialize-json.hh
398-
TYPE: LicenseType.unknown
399-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-buffer-deserialize-json.hh
400-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-buffer-deserialize-text.hh
401-
----------------------------------------------------------------------------------------------------
402-
Copyright © 2013 Google, Inc.
403-
404-
This is part of HarfBuzz, a text shaping library.
405-
406-
Permission is hereby granted, without written agreement and without
407-
license or royalty fees, to use, copy, modify, and distribute this
408-
software and its documentation for any purpose, provided that the
409-
above copyright notice and the following two paragraphs appear in
410-
all copies of this software.
411-
412-
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
413-
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
414-
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
415-
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
416-
DAMAGE.
417-
418-
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
419-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
420-
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
421-
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
422-
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
423-
====================================================================================================
424-
425-
====================================================================================================
426-
LIBRARY: harfbuzz
427-
ORIGIN: ../../../third_party/skia/third_party/harfbuzz/hb-ot-shape-complex-indic-machine.hh
428-
TYPE: LicenseType.unknown
429-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-ot-shape-complex-indic-machine.hh
430-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
431-
----------------------------------------------------------------------------------------------------
432-
Copyright © 2011,2012 Google, Inc.
433-
434-
This is part of HarfBuzz, a text shaping library.
435-
436-
Permission is hereby granted, without written agreement and without
437-
license or royalty fees, to use, copy, modify, and distribute this
438-
software and its documentation for any purpose, provided that the
439-
above copyright notice and the following two paragraphs appear in
440-
all copies of this software.
441-
442-
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
443-
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
444-
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
445-
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
446-
DAMAGE.
447-
448-
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
449-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
450-
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
451-
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
452-
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
453-
====================================================================================================
454-
455-
====================================================================================================
456-
LIBRARY: harfbuzz
457-
ORIGIN: ../../../third_party/skia/third_party/harfbuzz/hb-ot-shape-complex-use-machine.hh
458-
TYPE: LicenseType.unknown
459-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-ot-shape-complex-use-machine.hh
460-
----------------------------------------------------------------------------------------------------
461-
Copyright © 2015 Mozilla Foundation.
462-
Copyright © 2015 Google, Inc.
463-
464-
This is part of HarfBuzz, a text shaping library.
465-
466-
Permission is hereby granted, without written agreement and without
467-
license or royalty fees, to use, copy, modify, and distribute this
468-
software and its documentation for any purpose, provided that the
469-
above copyright notice and the following two paragraphs appear in
470-
all copies of this software.
471-
472-
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
473-
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
474-
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
475-
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
476-
DAMAGE.
477-
478-
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
479-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
480-
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
481-
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
482-
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
483-
====================================================================================================
484-
485-
====================================================================================================
486-
LIBRARY: harfbuzz
487-
ORIGIN: ../../../third_party/skia/third_party/harfbuzz/hb-version.h
488-
TYPE: LicenseType.unknown
489-
FILE: ../../../third_party/skia/third_party/harfbuzz/hb-version.h
490-
----------------------------------------------------------------------------------------------------
491-
Copyright © 2011 Google, Inc.
492-
493-
This is part of HarfBuzz, a text shaping library.
494-
495-
Permission is hereby granted, without written agreement and without
496-
license or royalty fees, to use, copy, modify, and distribute this
497-
software and its documentation for any purpose, provided that the
498-
above copyright notice and the following two paragraphs appear in
499-
all copies of this software.
500-
501-
IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
502-
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
503-
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
504-
IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
505-
DAMAGE.
506-
507-
THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
508-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
509-
FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
510-
ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
511-
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
512-
====================================================================================================
513-
514395
====================================================================================================
515396
LIBRARY: libsdl
516397
LIBRARY: skia
@@ -4467,6 +4348,7 @@ FILE: ../../../third_party/skia/modules/sksg/src/SkSGTransformPriv.h
44674348
FILE: ../../../third_party/skia/samplecode/SampleThinAA.cpp
44684349
FILE: ../../../third_party/skia/src/core/SkDescriptor.cpp
44694350
FILE: ../../../third_party/skia/src/gpu/GrBaseContextPriv.h
4351+
FILE: ../../../third_party/skia/src/gpu/GrContextPriv.cpp
44704352
FILE: ../../../third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp
44714353
FILE: ../../../third_party/skia/src/gpu/GrContext_Base.cpp
44724354
FILE: ../../../third_party/skia/src/gpu/GrImageContext.cpp
@@ -5712,4 +5594,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
57125594
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
57135595
THE SOFTWARE.
57145596
====================================================================================================
5715-
Total license count: 53
5597+
Total license count: 49

0 commit comments

Comments
 (0)