Skip to content

Commit

Permalink
Roll src/third_party/skia d445e2b6fcf1..91e0d7526944 (44 commits) (fl…
Browse files Browse the repository at this point in the history
…utter#15232)

https://skia.googlesource.com/skia.git/+log/d445e2b6fcf1..91e0d7526944

git log d445e2b6fcf1..91e0d7526944 --date=short --first-parent --format='%ad %ae %s'
2020-01-07 mtklein@google.com rm gm/skvm.cpp
2020-01-07 mtklein@google.com thread an SkArenaAlloc into shaders
2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 1031d2c65b5e..51e653f03f26 (10 commits)
2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/swiftshader 10a900e5ffaf..068dd89cab31 (7 commits)
2020-01-07 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src 3beaf136b459..55a27186b7de (337 commits)
2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-07 mtklein@google.com handle unpremul in skvm blitter
2020-01-07 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-06 benjaminwagner@google.com Add missing Metal jobs
2020-01-06 mtklein@google.com support kDecal in skvm image shader
2020-01-06 mtklein@google.com expand skvm image shader
2020-01-06 herb@google.com Make fBrokenRun local to doRegen.
2020-01-06 bsalomon@google.com Rename GrSimpleTextureEffect->GrTextureEffect
2020-01-06 benjaminwagner@google.com Remove Win2016 jobs.
2020-01-06 bsalomon@google.com Remove SkIRect::EmptyIRect
2020-01-06 herb@google.com Move the exit code to a common switch
2020-01-06 brianosman@google.com Add a few more SkRuntimeEffect unit tests
2020-01-06 bsalomon@google.com Revert "Revert "Clean up GrSimpleTextureEffect.""
2020-01-06 mtklein@google.com first foray into SkVM image shaders
2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-06 bsalomon@google.com Remove unused varying type param from GrGLSLShaderBuilder texture methods.
2020-01-06 brianosman@google.com Remove SkRuntimeShaderFactory
2020-01-06 robertphillips@google.com Add GrCompressedDimensions helper function
2020-01-06 csmartdalton@google.com Move "set_path_pt" from SampleAAGeometry into ToolUtils
2020-01-06 kjlubick@google.com [canvaskit] Remove support for T1 fonts and reduce code size
2020-01-06 kjlubick@google.com Make tracing data a compile-time option
2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-06 fmalita@chromium.org [skottie] cleanup: move transform & camera adapters to own CUs
2020-01-06 jlavrova@google.com Fix a bug with unresolved text
2020-01-06 csmartdalton@google.com Add a commandline flag to force offscreen rendering in viewer
2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-06 bsalomon@google.com Handle insane number of glyphs in GrAtlasTextOp.
2020-01-06 mtklein@google.com minor SkVMBlitter TODOs
2020-01-06 mtklein@google.com in gm/skvm.cpp, Fade doesn't need to wrap a shader
2020-01-06 jcgregorio@google.com Don't use CIPD_PKG_CPYTHON for P30.
2020-01-06 recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com Roll recipe dependencies (trivial).
2020-01-06 kjlubick@google.com [canvaskit] Update test to use correct metrics
2020-01-06 jlavrova@google.com Small bug fixes: leading spaces affect all width measurements, longest line and so on.
2020-01-06 kjlubick@google.com [canvaskit] Add npm release target to ship smaller binaries
2020-01-06 kjlubick@google.com [canvaskit] Add build flag for pathops
2020-01-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll third_party/externals/angle2 1fdf6ca5141d..1031d2c65b5e (5 commits)
2020-01-06 skia-autoroll@skia-public.iam.gserviceaccount.com Roll ../src a12a9d87841e..3beaf136b459 (315 commits)

Created with:
  gclient setdep -r src/third_party/skia@91e0d7526944

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
  • Loading branch information
skia-flutter-autoroll authored and brianosman committed Jan 7, 2020
1 parent abaac56 commit 3f52888
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ vars = {
'skia_git': 'https://skia.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': 'd445e2b6fcf1a051049b2e527feb1fca9a0a4946',
'skia_revision': '91e0d7526944f714706ec9510c346bd4eab3d5f1',

# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the
Expand Down
60 changes: 51 additions & 9 deletions ci/licenses_golden/licenses_skia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: 52d5a1113113fcff5f331b122101a0a0
Signature: 281b747ba0f64c8a40728d9c9b17b934

UNUSED LICENSES:

Expand Down Expand Up @@ -1114,7 +1114,7 @@ FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.e
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-Clang-Chorizo-CPU-Cortex_A7-arm-Release-All.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json
FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json
Expand Down Expand Up @@ -1277,8 +1277,8 @@ FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clan
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win10-MSVC-LenovoYogaC630-GPU-Adreno630-arm64-Debug-All-ANGLE.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2016-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FAAA.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-FSAA.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal.json
FILE: ../../../third_party/skia/infra/bots/recipes/test.expected/failed_dm.json
Expand Down Expand Up @@ -1337,6 +1337,7 @@ FILE: ../../../third_party/skia/infra/wasm-common/docker/perf-karma-chrome-tests
FILE: ../../../third_party/skia/modules/canvaskit/cpu.js
FILE: ../../../third_party/skia/modules/canvaskit/debug.js
FILE: ../../../third_party/skia/modules/canvaskit/externs.js
FILE: ../../../third_party/skia/modules/canvaskit/font.js
FILE: ../../../third_party/skia/modules/canvaskit/fonts/NotoMono-Regular.ttf
FILE: ../../../third_party/skia/modules/canvaskit/gpu.js
FILE: ../../../third_party/skia/modules/canvaskit/helper.js
Expand All @@ -1359,6 +1360,7 @@ FILE: ../../../third_party/skia/modules/canvaskit/karma.conf.js
FILE: ../../../third_party/skia/modules/canvaskit/package.json
FILE: ../../../third_party/skia/modules/canvaskit/paragraph.js
FILE: ../../../third_party/skia/modules/canvaskit/particles.js
FILE: ../../../third_party/skia/modules/canvaskit/pathops.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/animation.bench.js
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/confetti.json
FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/drinks.json
Expand All @@ -1368,7 +1370,9 @@ FILE: ../../../third_party/skia/modules/canvaskit/postamble.js
FILE: ../../../third_party/skia/modules/canvaskit/preamble.js
FILE: ../../../third_party/skia/modules/canvaskit/ready.js
FILE: ../../../third_party/skia/modules/canvaskit/release.js
FILE: ../../../third_party/skia/modules/canvaskit/rt_shader.js
FILE: ../../../third_party/skia/modules/canvaskit/skottie.js
FILE: ../../../third_party/skia/modules/canvaskit/skp.js
FILE: ../../../third_party/skia/modules/pathkit/chaining.js
FILE: ../../../third_party/skia/modules/pathkit/externs.js
FILE: ../../../third_party/skia/modules/pathkit/helper.js
Expand Down Expand Up @@ -3090,7 +3094,6 @@ FILE: ../../../third_party/skia/gm/postercircle.cpp
FILE: ../../../third_party/skia/gm/samplelocations.cpp
FILE: ../../../third_party/skia/gm/skbug_8664.cpp
FILE: ../../../third_party/skia/gm/skbug_8955.cpp
FILE: ../../../third_party/skia/gm/skvm.cpp
FILE: ../../../third_party/skia/gm/tessellation.cpp
FILE: ../../../third_party/skia/gm/video_decoder.cpp
FILE: ../../../third_party/skia/gm/yuv420_odd_dim.cpp
Expand Down Expand Up @@ -3849,8 +3852,8 @@ FILE: ../../../third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
FILE: ../../../third_party/skia/src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrCircleEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrEllipseEffect.fp
FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrSimpleTextureEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.cpp
FILE: ../../../third_party/skia/src/gpu/effects/GrTextureEffect.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.cpp
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrBlurredEdgeFragmentProcessor.h
FILE: ../../../third_party/skia/src/gpu/effects/generated/GrCircleEffect.cpp
Expand Down Expand Up @@ -4263,7 +4266,6 @@ FILE: ../../../third_party/skia/docs/examples/IPoint_subtract_operator.cpp
FILE: ../../../third_party/skia/docs/examples/IPoint_subtractfrom_operator.cpp
FILE: ../../../third_party/skia/docs/examples/IPoint_x.cpp
FILE: ../../../third_party/skia/docs/examples/IPoint_y.cpp
FILE: ../../../third_party/skia/docs/examples/IRect_EmptyIRect.cpp
FILE: ../../../third_party/skia/docs/examples/IRect_Intersects.cpp
FILE: ../../../third_party/skia/docs/examples/IRect_MakeEmpty.cpp
FILE: ../../../third_party/skia/docs/examples/IRect_MakeLTRB.cpp
Expand Down Expand Up @@ -6088,6 +6090,46 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/modules/skottie/src/Camera.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/modules/skottie/src/Camera.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Camera.h
FILE: ../../../third_party/skia/modules/skottie/src/Transform.cpp
FILE: ../../../third_party/skia/modules/skottie/src/Transform.h
----------------------------------------------------------------------------------------------------
Copyright 2020 Google Inc.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
====================================================================================================

====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/samplecode/SampleTextureUpload.cpp + ../../../third_party/skia/LICENSE
Expand Down Expand Up @@ -6722,4 +6764,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
====================================================================================================
Total license count: 53
Total license count: 54
32 changes: 32 additions & 0 deletions sky/packages/sky_engine/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -12490,6 +12490,38 @@ skia

Copyright 2019 The Android Open Source Project

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
skia

Copyright 2020 Google Inc.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
Expand Down

0 comments on commit 3f52888

Please sign in to comment.