Skip to content

Commit 41159ce

Browse files
Roll src/third_party/skia 91e0d7526944..f811fc331a14 (32 commits) (flutter#15306)
https://skia.googlesource.com/skia.git/+log/91e0d7526944..f811fc331a14 git log 91e0d7526944..f811fc331a14 --date=short --first-parent --format='%ad %ae %s' 2020-01-08 michaelludwig@google.com Avoid loop-dependent behavior in GrMemoryPoolBench 2020-01-08 borenet@google.com [infra] Fix build_task_drivers.sh, update infra dep 2020-01-08 brianosman@google.com Revert "Extend SkCanvas matrix stack to be 4x4, but with (basically) the same public API." 2020-01-08 jvanverth@google.com Revert "Move makeDeferredRenderTargetContext calls to factory on RTC." 2020-01-08 borenet@google.com [recipes] Remove unnecessary depot_tools dependency in flavor module 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 55a27186b7de..61f03e9a10c0 (434 commits) 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 51e653f03f26..db49bc7dd075 (8 commits) 2020-01-08 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 068dd89cab31..45a4d0f36bd6 (5 commits) 2020-01-07 herb@google.com Seperate out quad updating from atlas updating 2020-01-07 herb@google.com regenTextureCoordinates is always true when calling doRegen 2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2020-01-07 benjaminwagner@google.com Reland "Fixes for Vulkan Debug layers" 2020-01-07 mtklein@google.com bicubic in skvm image shader 2020-01-07 egdaniel@google.com Move makeDeferredRenderTargetContext calls to factory on RTC. 2020-01-07 herb@google.com Simplify the atlas update inner loop 2020-01-07 benjaminwagner@google.com Revert "Fixes for Vulkan Debug layers" 2020-01-07 csmartdalton@google.com Add a path renderer that uses GPU tessellation 2020-01-07 benjaminwagner@google.com Update remote access documentation for Win2019 2020-01-07 mtklein@google.com tolerate alpha slightly out of [0,1] 2020-01-07 brianosman@google.com In SkRuntimeEffect, guard against programs not compiling with GPU caps 2020-01-07 nifong@google.com Fix typo where width/height were swapped in new debug layer manager 2020-01-07 bsalomon@google.com Reland "Rename GrSimpleTextureEffect->GrTextureEffect" 2020-01-07 mtklein@google.com one option for fixing bilerp asserts 2020-01-07 mtklein@google.com upgrade debugging tools 2020-01-07 reed@google.com Extend SkCanvas matrix stack to be 4x4, but with (basically) the same public API. 2020-01-07 halcanary@google.com public.bzl: add SKOTTIE_IOS_LIB_SDK_FRAMEWORKS 2020-01-07 robertphillips@google.com Improve debug information provided when backend format and GrColorType don't match 2020-01-07 benjaminwagner@google.com Fixes for Vulkan Debug layers 2020-01-07 mtklein@google.com add SkVM_fwd.h 2020-01-07 mtklein@google.com handle kLow/kMedium in skvm image shader 2020-01-07 benjaminwagner@google.com Add NativeFonts job for Mac 10.15 CPU 2020-01-07 bsalomon@google.com Revert "Rename GrSimpleTextureEffect->GrTextureEffect" Created with: gclient setdep -r src/third_party/skia@f811fc331a14 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 jvanverth@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/+/master/autoroll/README.md Bug: None Tbr: jvanverth@google.com
1 parent f001ea2 commit 41159ce

File tree

3 files changed

+83
-3
lines changed

3 files changed

+83
-3
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': '91e0d7526944f714706ec9510c346bd4eab3d5f1',
29+
'skia_revision': 'f811fc331a143631f3ba48a266336ccf18d5a459',
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: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 281b747ba0f64c8a40728d9c9b17b934
1+
Signature: e3b27c65b71c50777d6ba18a2f1c4fc1
22

33
UNUSED LICENSES:
44

@@ -5071,6 +5071,7 @@ FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h
50715071
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp
50725072
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp
50735073
FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h
5074+
FILE: ../../../third_party/skia/samplecode/SampleTessellatedWedge.cpp
50745075
FILE: ../../../third_party/skia/src/core/SkMalloc.cpp
50755076
FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h
50765077
FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.cpp
@@ -5085,6 +5086,16 @@ FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.cp
50855086
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.h
50865087
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp
50875088
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.h
5089+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.cpp
5090+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.h
5091+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.cpp
5092+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.h
5093+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.cpp
5094+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.h
5095+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.cpp
5096+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.h
5097+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.cpp
5098+
FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.h
50885099
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp
50895100
FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.h
50905101
FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.cpp
@@ -6526,6 +6537,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
65266537
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
65276538
====================================================================================================
65286539

6540+
====================================================================================================
6541+
LIBRARY: skia
6542+
ORIGIN: ../../../third_party/skia/src/core/SkVM_fwd.h + ../../../third_party/skia/LICENSE
6543+
TYPE: LicenseType.bsd
6544+
FILE: ../../../third_party/skia/src/core/SkVM_fwd.h
6545+
----------------------------------------------------------------------------------------------------
6546+
Copyright 2020 Google LLC
6547+
6548+
Redistribution and use in source and binary forms, with or without
6549+
modification, are permitted provided that the following conditions are
6550+
met:
6551+
6552+
* Redistributions of source code must retain the above copyright
6553+
notice, this list of conditions and the following disclaimer.
6554+
6555+
* Redistributions in binary form must reproduce the above copyright
6556+
notice, this list of conditions and the following disclaimer in
6557+
the documentation and/or other materials provided with the
6558+
distribution.
6559+
6560+
* Neither the name of the copyright holder nor the names of its
6561+
contributors may be used to endorse or promote products derived
6562+
from this software without specific prior written permission.
6563+
6564+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6565+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6566+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6567+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6568+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6569+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6570+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6571+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6572+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6573+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6574+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6575+
====================================================================================================
6576+
65296577
====================================================================================================
65306578
LIBRARY: skia
65316579
ORIGIN: ../../../third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE
@@ -6764,4 +6812,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
67646812
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
67656813
THE SOFTWARE.
67666814
====================================================================================================
6767-
Total license count: 54
6815+
Total license count: 55

sky/packages/sky_engine/LICENSE

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12551,6 +12551,38 @@ skia
1255112551

1255212552
Copyright 2020 Google Inc.
1255312553

12554+
Redistribution and use in source and binary forms, with or without
12555+
modification, are permitted provided that the following conditions are
12556+
met:
12557+
12558+
* Redistributions of source code must retain the above copyright
12559+
notice, this list of conditions and the following disclaimer.
12560+
12561+
* Redistributions in binary form must reproduce the above copyright
12562+
notice, this list of conditions and the following disclaimer in
12563+
the documentation and/or other materials provided with the
12564+
distribution.
12565+
12566+
* Neither the name of the copyright holder nor the names of its
12567+
contributors may be used to endorse or promote products derived
12568+
from this software without specific prior written permission.
12569+
12570+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12571+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12572+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12573+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12574+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12575+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12576+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12577+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12578+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12579+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12580+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12581+
--------------------------------------------------------------------------------
12582+
skia
12583+
12584+
Copyright 2020 Google LLC
12585+
1255412586
Redistribution and use in source and binary forms, with or without
1255512587
modification, are permitted provided that the following conditions are
1255612588
met:

0 commit comments

Comments
 (0)