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

Commit e657661

Browse files
Roll src/third_party/skia 740f859..6f1c20f (16 commits) (#13343)
https://skia.googlesource.com/skia.git/+log/740f85949db2..6f1c20f01fa9 git log 740f859..6f1c20f --date=short --no-merges --format='%ad %ae %s' 2019-10-24 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2019-10-24 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2019-10-24 ethannicholas@google.com Vulkan SkSL code now works in locales which use ',' as the decimal separator. 2019-10-24 rmistry@google.com Make NUC7i5BNK SkottieWASM/Lottie_Web bots ON_DEMAND 2019-10-24 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2019-10-24 bsalomon@google.com Reland "Allow direct readback for formats in non-ES OpenGL" 2019-10-24 halcanary@google.com [minor] nanobench: use default member initializer 2019-10-24 mtklein@google.com remove NEON matrix procs 2019-10-24 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial). 2019-10-24 herb@google.com Change code() to glyphID() on SkGlyph. 2019-10-24 csmartdalton@google.com Reland "ccpr: Unblacklist Qualcomm with msaa" 2019-10-24 bsalomon@google.com Make GrSurfaceProxy ref counts thread safe. 2019-10-24 mtklein@google.com did you mean to leave this in? 2019-10-24 jvanverth@google.com Reland "Enable Programs (formerly GLPrograms) test for other APIs" 2019-10-24 bsalomon@google.com GrResourceProvider::MakeApprox() fix after SkISizification 2019-10-24 robertphillips@google.com Pull tessellation forward into GrTextureOp::onPrePrepareDraws Created with: gclient setdep -r src/third_party/skia@6f1c20f01fa9 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 michaelludwig@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=michaelludwig@google.com
1 parent 8a6cfd2 commit e657661

3 files changed

Lines changed: 3 additions & 68 deletions

File tree

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': '740f85949db2aeb20641c790a8be18512838dfcc',
29+
'skia_revision': '6f1c20f01fa923cd0029aace7b39aef62ff3ed2a',
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: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: f190028f7952baaf9c1b331324eb994d
1+
Signature: 999ce8b65a4378f9442aaaba31a0bb63
22

33
UNUSED LICENSES:
44

@@ -6095,41 +6095,6 @@ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
60956095
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
60966096
====================================================================================================
60976097

6098-
====================================================================================================
6099-
LIBRARY: skia
6100-
ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
6101-
TYPE: LicenseType.bsd
6102-
FILE: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp
6103-
----------------------------------------------------------------------------------------------------
6104-
NEON optimized code (C) COPYRIGHT 2009 Motorola
6105-
6106-
Redistribution and use in source and binary forms, with or without
6107-
modification, are permitted provided that the following conditions are
6108-
met:
6109-
6110-
* Redistributions of source code must retain the above copyright
6111-
notice, this list of conditions and the following disclaimer.
6112-
* Redistributions in binary form must reproduce the above
6113-
copyright notice, this list of conditions and the following disclaimer
6114-
in the documentation and/or other materials provided with the
6115-
distribution.
6116-
* Neither the name of Google Inc. nor the names of its
6117-
contributors may be used to endorse or promote products derived from
6118-
this software without specific prior written permission.
6119-
6120-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
6121-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
6122-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
6123-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
6124-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
6125-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
6126-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
6127-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
6128-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
6129-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6130-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6131-
====================================================================================================
6132-
61336098
====================================================================================================
61346099
LIBRARY: skia
61356100
ORIGIN: ../../../third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp + ../../../third_party/skia/LICENSE
@@ -6618,4 +6583,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
66186583
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
66196584
THE SOFTWARE.
66206585
====================================================================================================
6621-
Total license count: 53
6586+
Total license count: 52

sky/packages/sky_engine/LICENSE

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12388,36 +12388,6 @@ distribution.
1238812388
contributors may be used to endorse or promote products derived from
1238912389
this software without specific prior written permission.
1239012390

12391-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
12392-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
12393-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
12394-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
12395-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
12396-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
12397-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
12398-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
12399-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
12400-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
12401-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
12402-
--------------------------------------------------------------------------------
12403-
skia
12404-
12405-
NEON optimized code (C) COPYRIGHT 2009 Motorola
12406-
12407-
Redistribution and use in source and binary forms, with or without
12408-
modification, are permitted provided that the following conditions are
12409-
met:
12410-
12411-
* Redistributions of source code must retain the above copyright
12412-
notice, this list of conditions and the following disclaimer.
12413-
* Redistributions in binary form must reproduce the above
12414-
copyright notice, this list of conditions and the following disclaimer
12415-
in the documentation and/or other materials provided with the
12416-
distribution.
12417-
* Neither the name of Google Inc. nor the names of its
12418-
contributors may be used to endorse or promote products derived from
12419-
this software without specific prior written permission.
12420-
1242112391
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1242212392
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1242312393
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

0 commit comments

Comments
 (0)