Skip to content

Commit

Permalink
Roll Skia from dd069a9188cc to 08f5311ae142 (5 revisions) (flutter#23816
Browse files Browse the repository at this point in the history
)

https://skia.googlesource.com/skia.git/+log/dd069a9188cc..08f5311ae142

2021-01-21 adlai@google.com Detemplatize render task clustering
2021-01-20 brianosman@google.com Remove "death" functions from particle system
2021-01-20 csmartdalton@google.com Reland "Disable the MSAA atlas mode for CCPR"
2021-01-20 bsalomon@google.com GrQuadUtils: Handle degenerate persp quads where edges intersect outside quad
2021-01-20 reed@google.com Enable new virtuals in flutter

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/skia-flutter-autoroll
Please CC scroggo@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md
  • Loading branch information
skia-flutter-autoroll committed Jan 21, 2021
1 parent ab0c027 commit a05fc88
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 46 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ vars = {
'skia_git': 'https://skia.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': 'dd069a9188cc3700d56cabf54e032351340a23b1',
'skia_revision': '08f5311ae142a8fe86d2e055080287d5345705ac',

# 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
94 changes: 49 additions & 45 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 64401e9b59d9b76344e4c9972e65162b
Signature: 734407a3dc575d8e62aeb9c005347840

UNUSED LICENSES:

Expand Down Expand Up @@ -4196,7 +4196,6 @@ FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h
FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h
FILE: ../../../third_party/skia/src/gpu/GrRecordingContextPriv.cpp
FILE: ../../../third_party/skia/src/gpu/GrSTArenaList.h
FILE: ../../../third_party/skia/src/gpu/GrTCluster.h
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.cpp
FILE: ../../../third_party/skia/src/gpu/GrThreadSafeCache.h
FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h
Expand Down Expand Up @@ -5947,6 +5946,10 @@ TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/colorspace.cpp
FILE: ../../../third_party/skia/modules/svg/include/SkSVGMask.h
FILE: ../../../third_party/skia/modules/svg/src/SkSVGMask.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.cpp
FILE: ../../../third_party/skia/src/gpu/GrRenderTaskCluster.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockRenderTask.h
FILE: ../../../third_party/skia/src/gpu/mock/GrMockSurfaceProxy.h
----------------------------------------------------------------------------------------------------
Copyright 2021 Google Inc.

Expand Down Expand Up @@ -5979,6 +5982,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/gm/crbug_1167277.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/gm/crbug_1167277.cpp
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
----------------------------------------------------------------------------------------------------
Copyright 2021 Google LLC

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

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -7128,49 +7175,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/core/SkYUVAInfoLocation.h
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.cpp
FILE: ../../../third_party/skia/src/gpu/GrYUVATextureProxies.h
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLBuiltinTypes.h
FILE: ../../../third_party/skia/src/sksl/SkSLContext.cpp
FILE: ../../../third_party/skia/src/sksl/SkSLMangler.h
----------------------------------------------------------------------------------------------------
Copyright 2021 Google LLC

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

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE
Expand Down

0 comments on commit a05fc88

Please sign in to comment.