Skip to content

Commit 39b2e4b

Browse files
Roll src/third_party/skia 76dc683364c2..3560ea702f1b (10 commits) (flutter#7420)
https://skia.googlesource.com/skia.git/%2Blog/76dc683364c2..3560ea702f1b git log 76dc683364c2d48b87e7b1b414a3d456203e156c..3560ea702f1bab12104112000f2776a754d07f61 --date=short --no-merges --format=%ad %ae %s 2019-01-08 [email protected] drawText Cleanup, part 3 2019-01-08 [email protected] drawText Cleanup, part 4 2019-01-08 [email protected] drawText Cleanup, part 2 2019-01-09 [email protected] Remove SK_LEGACY_TESSELLATOR_CPU_COVERAGE 2019-01-09 [email protected] Remove android framework compile bots from CQ 2019-01-09 [email protected] SkPDF: rasterize for color-filter&flutter#43;layer 2019-01-08 [email protected] Don&flutter#39;t store local coordinates for solid color quad ops 2019-01-09 [email protected] Roll recipe dependencies (trivial). 2019-01-08 [email protected] Update BUILDCONFIG.gn to support Visual Studio 2017 Enterprise 2019-01-08 [email protected] Use ICU in libandroidicu The AutoRoll server is located here: https://autoroll.skia.org/r/skia-flutter-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff ([email protected]), and stop the roller if necessary.
1 parent 88e212f commit 39b2e4b

File tree

3 files changed

+68
-3
lines changed

3 files changed

+68
-3
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ vars = {
2323
'fuchsia_git': 'https://fuchsia.googlesource.com',
2424
'github_git': 'https://github.com',
2525
'skia_git': 'https://skia.googlesource.com',
26-
'skia_revision': '76dc683364c2d48b87e7b1b414a3d456203e156c',
26+
'skia_revision': '3560ea702f1bab12104112000f2776a754d07f61',
2727

2828
# When updating the Dart revision, ensure that all entries that are
2929
# dependencies of Dart are also updated to match the entries in the

ci/licenses_golden/licenses_skia

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 0d6fbd6dc3d322399dc0425222da47f5
1+
Signature: 061a39a7788d04a8922d62e9bbb7eea4
22

33
UNUSED LICENSES:
44

@@ -4821,6 +4821,41 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
48214821
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
48224822
====================================================================================================
48234823

4824+
====================================================================================================
4825+
LIBRARY: skia
4826+
ORIGIN: ../../../third_party/skia/gm/crbug_918512.cpp + ../../../third_party/skia/LICENSE
4827+
TYPE: LicenseType.bsd
4828+
FILE: ../../../third_party/skia/gm/crbug_918512.cpp
4829+
----------------------------------------------------------------------------------------------------
4830+
Copyright 2019 Google LLC.
4831+
4832+
Redistribution and use in source and binary forms, with or without
4833+
modification, are permitted provided that the following conditions are
4834+
met:
4835+
4836+
* Redistributions of source code must retain the above copyright
4837+
notice, this list of conditions and the following disclaimer.
4838+
* Redistributions in binary form must reproduce the above
4839+
copyright notice, this list of conditions and the following disclaimer
4840+
in the documentation and/or other materials provided with the
4841+
distribution.
4842+
* Neither the name of Google Inc. nor the names of its
4843+
contributors may be used to endorse or promote products derived from
4844+
this software without specific prior written permission.
4845+
4846+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
4847+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
4848+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4849+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
4850+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
4851+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4852+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
4853+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
4854+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
4855+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
4856+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4857+
====================================================================================================
4858+
48244859
====================================================================================================
48254860
LIBRARY: skia
48264861
ORIGIN: ../../../third_party/skia/include/config/SkUserConfig.h + ../../../third_party/skia/LICENSE
@@ -6063,4 +6098,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
60636098
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
60646099
THE SOFTWARE.
60656100
====================================================================================================
6066-
Total license count: 54
6101+
Total license count: 55

sky/packages/sky_engine/LICENSE

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10944,6 +10944,36 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1094410944
--------------------------------------------------------------------------------
1094510945
skia
1094610946

10947+
Copyright 2019 Google LLC.
10948+
10949+
Redistribution and use in source and binary forms, with or without
10950+
modification, are permitted provided that the following conditions are
10951+
met:
10952+
10953+
* Redistributions of source code must retain the above copyright
10954+
notice, this list of conditions and the following disclaimer.
10955+
* Redistributions in binary form must reproduce the above
10956+
copyright notice, this list of conditions and the following disclaimer
10957+
in the documentation and/or other materials provided with the
10958+
distribution.
10959+
* Neither the name of Google Inc. nor the names of its
10960+
contributors may be used to endorse or promote products derived from
10961+
this software without specific prior written permission.
10962+
10963+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
10964+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
10965+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
10966+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
10967+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
10968+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
10969+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
10970+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
10971+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
10972+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
10973+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
10974+
--------------------------------------------------------------------------------
10975+
skia
10976+
1094710977
NEON optimized code (C) COPYRIGHT 2009 Motorola
1094810978

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

0 commit comments

Comments
 (0)