Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit bb99d80

Browse files
Roll src/third_party/skia f811fc3..04e7781 (7 commits) (#15312)
https://skia.googlesource.com/skia.git/+log/f811fc331a14..04e77813f8f4 git log f811fc3..04e7781 --date=short --first-parent --format='%ad %ae %s' 2020-01-08 [email protected] Revert "Prevent de-duplication of Housekeeper-PerCommit-BuildTaskDrivers" 2020-01-08 [email protected] [canvaskit] Add webp support 2020-01-08 [email protected] Add debug gpu abandon bots and fix yuv crash. 2020-01-08 [email protected] Reland "GrGLMakeNativeInterface_{iOS,mac,win}: clean up" 2020-01-08 [email protected] add Brian's fiddle as gm/bicubic 2020-01-08 [email protected] Revert "Revert "Extend SkCanvas matrix stack to be 4x4, but with (basically) the same public API."" 2020-01-08 [email protected] Revert "Avoid loop-dependent behavior in GrMemoryPoolBench" Created with: gclient setdep -r src/third_party/skia@04e77813f8f4 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 [email protected] 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: [email protected]
1 parent 21e511c commit bb99d80

File tree

2 files changed

+46
-42
lines changed

2 files changed

+46
-42
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': 'f811fc331a143631f3ba48a266336ccf18d5a459',
29+
'skia_revision': '04e77813f8f491b43dfe8e139acbdeda951f63d9',
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: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: e3b27c65b71c50777d6ba18a2f1c4fc1
1+
Signature: 5690edf519a79588ed0f6ffbc036dc99
22

33
UNUSED LICENSES:
44

@@ -5365,6 +5365,50 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
53655365
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53665366
====================================================================================================
53675367

5368+
====================================================================================================
5369+
LIBRARY: skia
5370+
ORIGIN: ../../../third_party/skia/gm/bicubic.cpp + ../../../third_party/skia/LICENSE
5371+
TYPE: LicenseType.bsd
5372+
FILE: ../../../third_party/skia/gm/bicubic.cpp
5373+
FILE: ../../../third_party/skia/include/private/SkM44.h
5374+
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
5375+
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
5376+
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
5377+
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
5378+
FILE: ../../../third_party/skia/src/core/SkCanvasMatrix.h
5379+
FILE: ../../../third_party/skia/src/core/SkM44.cpp
5380+
----------------------------------------------------------------------------------------------------
5381+
Copyright 2020 Google Inc.
5382+
5383+
Redistribution and use in source and binary forms, with or without
5384+
modification, are permitted provided that the following conditions are
5385+
met:
5386+
5387+
* Redistributions of source code must retain the above copyright
5388+
notice, this list of conditions and the following disclaimer.
5389+
5390+
* Redistributions in binary form must reproduce the above copyright
5391+
notice, this list of conditions and the following disclaimer in
5392+
the documentation and/or other materials provided with the
5393+
distribution.
5394+
5395+
* Neither the name of the copyright holder nor the names of its
5396+
contributors may be used to endorse or promote products derived
5397+
from this software without specific prior written permission.
5398+
5399+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5400+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5401+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5402+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5403+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5404+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5405+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5406+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5407+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5408+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5409+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5410+
====================================================================================================
5411+
53685412
====================================================================================================
53695413
LIBRARY: skia
53705414
ORIGIN: ../../../third_party/skia/gm/circles.cpp + ../../../third_party/skia/LICENSE
@@ -6101,46 +6145,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
61016145
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
61026146
====================================================================================================
61036147

6104-
====================================================================================================
6105-
LIBRARY: skia
6106-
ORIGIN: ../../../third_party/skia/modules/skottie/src/Camera.cpp + ../../../third_party/skia/LICENSE
6107-
TYPE: LicenseType.bsd
6108-
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
6109-
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
6110-
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
6111-
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
6112-
----------------------------------------------------------------------------------------------------
6113-
Copyright 2020 Google Inc.
6114-
6115-
Redistribution and use in source and binary forms, with or without
6116-
modification, are permitted provided that the following conditions are
6117-
met:
6118-
6119-
* Redistributions of source code must retain the above copyright
6120-
notice, this list of conditions and the following disclaimer.
6121-
6122-
* Redistributions in binary form must reproduce the above copyright
6123-
notice, this list of conditions and the following disclaimer in
6124-
the documentation and/or other materials provided with the
6125-
distribution.
6126-
6127-
* Neither the name of the copyright holder nor the names of its
6128-
contributors may be used to endorse or promote products derived
6129-
from this software without specific prior written permission.
6130-
6131-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6132-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6133-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6134-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6135-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6136-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6137-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6138-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6139-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6140-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6141-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6142-
====================================================================================================
6143-
61446148
====================================================================================================
61456149
LIBRARY: skia
61466150
ORIGIN: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE

0 commit comments

Comments
 (0)