Skip to content

Commit

Permalink
Roll src/third_party/skia 6e487e67a3f3..641ac7daa81c (16 commits) (fl…
Browse files Browse the repository at this point in the history
…utter#5948)

Auto-roller completed checks. Merging.
  • Loading branch information
skia-flutter-autoroll authored Aug 6, 2018
1 parent bc885f3 commit 4681351
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 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': '6e487e67a3f32108a3c0cf922d0870bd516a50eb',
'skia_revision': '641ac7daa81cbfca06b310803fb1a607d0fc2b32',

# 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
10 changes: 7 additions & 3 deletions travis/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 1c3b1fdc80cef394e3f8a065aed59a32
Signature: 49141c6e499a85d947a3b6be8fd7065b

UNUSED LICENSES:

Expand Down Expand Up @@ -1270,9 +1270,11 @@ LIBRARY: skcms
LIBRARY: skia
LIBRARY: vulkan
LIBRARY: vulkanmemoryallocator
ORIGIN: ../../../third_party/skia/bench/GrCCGeometryBench.cpp + ../../../third_party/skia/LICENSE
ORIGIN: ../../../third_party/skia/bench/CompositingImagesBench.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/bench/CompositingImagesBench.cpp
FILE: ../../../third_party/skia/bench/GrCCGeometryBench.cpp
FILE: ../../../third_party/skia/bench/ImageCycleBench.cpp
FILE: ../../../third_party/skia/bench/JSONBench.cpp
FILE: ../../../third_party/skia/bench/PolyUtilsBench.cpp
FILE: ../../../third_party/skia/bench/ShaderMaskFilterBench.cpp
Expand Down Expand Up @@ -1477,6 +1479,9 @@ FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyManager.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlCopyPipelineState.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlGpuCommandBuffer.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineState.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.h
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
FILE: ../../../third_party/skia/src/gpu/mtl/GrMtlTextureRenderTarget.h
Expand Down Expand Up @@ -3797,7 +3802,6 @@ FILE: ../../../third_party/skia/bench/ClipMaskBench.cpp
FILE: ../../../third_party/skia/bench/ClipStrategyBench.cpp
FILE: ../../../third_party/skia/bench/ColorCanvasDrawBitmapBench.cpp
FILE: ../../../third_party/skia/bench/CubicKLMBench.cpp
FILE: ../../../third_party/skia/bench/MultitextureImageBench.cpp
FILE: ../../../third_party/skia/bench/PathTextBench.cpp
FILE: ../../../third_party/skia/bench/ShadowBench.cpp
FILE: ../../../third_party/skia/dm/DMGpuTestProcs.cpp
Expand Down

0 comments on commit 4681351

Please sign in to comment.