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

Commit edaa650

Browse files
Roll Skia from 30212b7 to 3d6bf04 (17 revisions)
https://skia.googlesource.com/skia.git/+log/30212b7941d6..3d6bf04366f6 2020-06-12 [email protected] make options robust 2020-06-12 [email protected] Skottie example app to copy InputStreams in Java. 2020-06-12 [email protected] Cache last-accessed entry in lastRenderTask table. 2020-06-12 [email protected] Move all SkReadBuffer member initialization to header 2020-06-12 [email protected] [skjson] Use lower bits for tagging 2020-06-12 [email protected] Make explicit SDF default values. 2020-06-12 [email protected] [canvaskit] Fix bug with TextStyle color 2020-06-12 [email protected] Make ColorTableEffect use child processor 2020-06-12 [email protected] Initialize SkReadBuffer pointers 2020-06-12 [email protected] Reland "Fetch clang-format automatically when compiling .fp files." 2020-06-12 [email protected] add svg fuzzer 2020-06-12 [email protected] remove (unused) duplicate field of fUniqueID 2020-06-12 [email protected] Roll Chromium from 3f86fb2f52c2 to 0f6d038f871a (417 revisions) 2020-06-12 [email protected] Roll ANGLE from db3ef87 to ff2ebce (16 revisions) 2020-06-12 [email protected] Roll SwiftShader from 45510ad8a778 to a6940c8e6eb0 (1 revision) 2020-06-12 [email protected] Roll dawn from b6eff5acf06f to 5fafb49c7b4d (11 revisions) 2020-06-11 [email protected] GrClips know their device dimensions 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/+doc/master/autoroll/README.md
1 parent b2fea9d commit edaa650

File tree

3 files changed

+73
-3
lines changed

3 files changed

+73
-3
lines changed

DEPS

+1-1
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': '30212b7941d6aa3b50978bac103f3c5b1b8cd20a',
29+
'skia_revision': '3d6bf04366f6bb33b058b39066dd92334c185a66',
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

+40-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 1627ef956dbb3f190d56cedf42ae5d78
1+
Signature: f80526dd737771501e0edc84c3944355
22

33
UNUSED LICENSES:
44

@@ -2458,6 +2458,7 @@ FILE: ../../../third_party/skia/src/gpu/GrDrawingManager.cpp
24582458
FILE: ../../../third_party/skia/src/gpu/GrDrawingManager.h
24592459
FILE: ../../../third_party/skia/src/gpu/GrFragmentProcessor.cpp
24602460
FILE: ../../../third_party/skia/src/gpu/GrGpuResourcePriv.h
2461+
FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h
24612462
FILE: ../../../third_party/skia/src/gpu/GrManagedResource.h
24622463
FILE: ../../../third_party/skia/src/gpu/GrNonAtomicRef.h
24632464
FILE: ../../../third_party/skia/src/gpu/GrOpFlushState.cpp
@@ -5723,6 +5724,43 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
57235724
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
57245725
====================================================================================================
57255726

5727+
====================================================================================================
5728+
LIBRARY: skia
5729+
ORIGIN: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp + ../../../third_party/skia/LICENSE
5730+
TYPE: LicenseType.bsd
5731+
FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp
5732+
----------------------------------------------------------------------------------------------------
5733+
Copyright 2020 Google, LLC
5734+
5735+
Redistribution and use in source and binary forms, with or without
5736+
modification, are permitted provided that the following conditions are
5737+
met:
5738+
5739+
* Redistributions of source code must retain the above copyright
5740+
notice, this list of conditions and the following disclaimer.
5741+
5742+
* Redistributions in binary form must reproduce the above copyright
5743+
notice, this list of conditions and the following disclaimer in
5744+
the documentation and/or other materials provided with the
5745+
distribution.
5746+
5747+
* Neither the name of the copyright holder nor the names of its
5748+
contributors may be used to endorse or promote products derived
5749+
from this software without specific prior written permission.
5750+
5751+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
5752+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
5753+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
5754+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
5755+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
5756+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
5757+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
5758+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
5759+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
5760+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
5761+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5762+
====================================================================================================
5763+
57265764
====================================================================================================
57275765
LIBRARY: skia
57285766
ORIGIN: ../../../third_party/skia/gm/circles.cpp + ../../../third_party/skia/LICENSE
@@ -7134,4 +7172,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
71347172
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
71357173
THE SOFTWARE.
71367174
====================================================================================================
7137-
Total license count: 58
7175+
Total license count: 59

sky/packages/sky_engine/LICENSE

+32
Original file line numberDiff line numberDiff line change
@@ -12684,6 +12684,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1268412684
--------------------------------------------------------------------------------
1268512685
skia
1268612686

12687+
Copyright 2020 Google, LLC
12688+
12689+
Redistribution and use in source and binary forms, with or without
12690+
modification, are permitted provided that the following conditions are
12691+
met:
12692+
12693+
* Redistributions of source code must retain the above copyright
12694+
notice, this list of conditions and the following disclaimer.
12695+
12696+
* Redistributions in binary form must reproduce the above copyright
12697+
notice, this list of conditions and the following disclaimer in
12698+
the documentation and/or other materials provided with the
12699+
distribution.
12700+
12701+
* Neither the name of the copyright holder nor the names of its
12702+
contributors may be used to endorse or promote products derived
12703+
from this software without specific prior written permission.
12704+
12705+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12706+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12707+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12708+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12709+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12710+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12711+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12712+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12713+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12714+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12715+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12716+
--------------------------------------------------------------------------------
12717+
skia
12718+
1268712719
Copyright 2020 The Chromium Authors. All rights reserved.
1268812720

1268912721
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)