From 29816a6607af3db2e02e4ceecb37134dbf276e39 Mon Sep 17 00:00:00 2001 From: skia-flutter-autoroll <37626415+skia-flutter-autoroll@users.noreply.github.com> Date: Mon, 23 Apr 2018 10:26:07 -0400 Subject: [PATCH] Roll src/third_party/skia/ 3d0e8507f..5209d7fce (14 commits) (#5061) https://skia.googlesource.com/skia.git/+log/3d0e8507face..5209d7fce35f $ git log 3d0e8507f..5209d7fce --date=short --no-merges --format='%ad %ae %s' 2018-04-20 bsalomon Fix starting location in GrRTC::drawOval when converting to GrShape 2018-04-20 bsalomon Analytic dashing of circles with single on/off intervals and butt caps. 2018-04-20 brianosman Fix argument names and documentation for SkMatrix44::set3x3() 2018-04-18 enne Reland "Add stub gpu workaround generators" 2018-04-20 robertphillips Add ability to dump opList info at flush-time 2018-04-20 benjaminwagner Fix Housekeeper-PerCommit-InfraTests 2018-04-20 scroggo Reduce threads used for DNG decodes on Android 2018-04-19 benjaminwagner Add SwiftShader Build jobs. 2018-04-19 benjaminwagner Add cmake_linux asset. 2018-04-20 egdaniel Add discard check when deciding if we should execute op list or not. 2018-04-20 robertphillips Remove another writePixels instance 2018-04-18 csmartdalton ccpr: Don't solve for cubic roots that are out of range 2018-04-19 benjaminwagner Add SwiftShader to DEPS. 2018-04-19 csmartdalton ccpr: Fix flatness and triangle-ness detection for conics Created with: roll-dep src/third_party/skia --- DEPS | 2 +- sky/packages/sky_engine/LICENSE | 1 + travis/licenses_golden/licenses_third_party | 43 ++++++++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 091d535d159..3f704b72a21 100644 --- a/DEPS +++ b/DEPS @@ -23,7 +23,7 @@ vars = { 'fuchsia_git': 'https://fuchsia.googlesource.com', 'github_git': 'https://github.com', 'skia_git': 'https://skia.googlesource.com', - 'skia_revision': '3d0e8507face451a4b17698beb6ad0ea51b9ef1d', + 'skia_revision': '5209d7fce35f4426be86de56aa4a1966c992e6f5', # When updating the Dart revision, ensure that all entries that are # dependencies of Dart are also updated to match the entries in the diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 4205ee5b1b4..60ab2b05c79 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -10081,6 +10081,7 @@ See the License for the specific language governing permissions and limitations under the License. -------------------------------------------------------------------------------- engine +skia topaz Copyright 2018 The Chromium Authors. All rights reserved. diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index 64257883a0a..3c761431d5f 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: f6b276036e543bc2ddf0a09253044a51 +Signature: c777dad9be6d069deb9606cc1751cf4d UNUSED LICENSES: @@ -17239,6 +17239,8 @@ FILE: ../../../third_party/skia/src/effects/SkTrimPE.h FILE: ../../../third_party/skia/src/effects/SkTrimPathEffect.cpp FILE: ../../../third_party/skia/src/gpu/GrDDLContext.cpp FILE: ../../../third_party/skia/src/gpu/GrDirectContext.cpp +FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkarounds.cpp +FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkarounds.h FILE: ../../../third_party/skia/src/gpu/GrFPArgs.h FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.cpp FILE: ../../../third_party/skia/src/gpu/GrProxyProvider.h @@ -17452,6 +17454,7 @@ FILE: ../../../third_party/skia/infra/bots/assets/chromebook_arm_gles/VERSION FILE: ../../../third_party/skia/infra/bots/assets/chromebook_x86_64_gles/VERSION FILE: ../../../third_party/skia/infra/bots/assets/clang_linux/VERSION FILE: ../../../third_party/skia/infra/bots/assets/clang_win/VERSION +FILE: ../../../third_party/skia/infra/bots/assets/cmake_linux/VERSION FILE: ../../../third_party/skia/infra/bots/assets/emscripten_sdk/VERSION FILE: ../../../third_party/skia/infra/bots/assets/gcloud_linux/VERSION FILE: ../../../third_party/skia/infra/bots/assets/go/VERSION @@ -17507,6 +17510,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/Build-Debian9-Clang-x86_64-Release-Fast.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Mini.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-NoDEPS.json +FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-SwiftShader.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Vulkan.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-EMCC-wasm-Release.json FILE: ../../../third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-loongson3a-Release.json @@ -20914,6 +20918,41 @@ 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/src/gpu/GrDriverBugWorkaroundsAutogen.h + ../../../LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/gpu/GrDriverBugWorkaroundsAutogen.h +---------------------------------------------------------------------------------------------------- +Copyright 2018 The Chromium Authors. All rights reserved. + +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 Google Inc. 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/src/gpu/ops/GrSmallPathRenderer.cpp + ../../../third_party/skia/LICENSE @@ -21923,4 +21962,4 @@ freely, subject to the following restrictions: misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. ==================================================================================================== -Total license count: 318 +Total license count: 319