Skip to content

Commit

Permalink
Roll src/third_party/skia 4ec72f7..e923ccc (13 commits) (flutter#5719)
Browse files Browse the repository at this point in the history
Auto-roller completed checks. Merging.
  • Loading branch information
skia-flutter-autoroll authored Jul 11, 2018
1 parent 48d6e1f commit 0c33c2e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': '4ec72f7cc745bbd98a0ae0d160e774ce8ad1a1ff',
'skia_revision': 'e923cccb258e920d1ef91ff39a4da83d8c856d0e',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
17 changes: 9 additions & 8 deletions travis/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 1e7a2c73d6034f63fa374cd00dce31b1
Signature: 5b8c5ee1df4ba63758477360a16e93ad

UNUSED LICENSES:

Expand Down Expand Up @@ -17274,6 +17274,7 @@ FILE: ../../../third_party/skia/experimental/docs/jsonbaseddoc.htm
FILE: ../../../third_party/skia/experimental/docs/svgBackend.js
FILE: ../../../third_party/skia/experimental/docs/svgbaseddoc.htm
FILE: ../../../third_party/skia/experimental/docs/utilities.js
FILE: ../../../third_party/skia/experimental/wasm/shell.html
FILE: ../../../third_party/skia/infra/bots/android_bin.isolate
FILE: ../../../third_party/skia/infra/bots/assets.isolate
FILE: ../../../third_party/skia/infra/bots/assets/android_ndk_darwin/VERSION
Expand Down Expand Up @@ -18822,7 +18823,6 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.h
FILE: ../../../third_party/skia/src/gpu/text/GrTextUtils.cpp
FILE: ../../../third_party/skia/src/gpu/text/GrTextUtils.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBackendContext.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp
FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h
FILE: ../../../third_party/skia/src/gpu/vk/GrVkCaps.cpp
Expand Down Expand Up @@ -19677,11 +19677,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/experimental/wasm/wasm_main.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp
FILE: ../../../third_party/skia/experimental/wasm/wasm_main.cpp
FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp
----------------------------------------------------------------------------------------------------
Copyright 2016 Mozilla Foundation
Copyright 2018 Google LLC

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -19712,11 +19713,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/fuzz/FuzzEncoders.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/fuzz/FuzzEncoders.cpp
FILE: ../../../third_party/skia/fuzz/FuzzDrawFunctions.cpp
----------------------------------------------------------------------------------------------------
Copyright 2018 Google LLC
Copyright 2016 Mozilla Foundation

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down

0 comments on commit 0c33c2e

Please sign in to comment.