diff --git a/DEPS b/DEPS index a5486b9899a26..63c00b5c95391 100644 --- a/DEPS +++ b/DEPS @@ -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': '91e0d7526944f714706ec9510c346bd4eab3d5f1', + 'skia_revision': 'f811fc331a143631f3ba48a266336ccf18d5a459', # 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/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 516c6991eae69..89aa9592414e5 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 281b747ba0f64c8a40728d9c9b17b934 +Signature: e3b27c65b71c50777d6ba18a2f1c4fc1 UNUSED LICENSES: @@ -5071,6 +5071,7 @@ FILE: ../../../third_party/skia/modules/skplaintexteditor/src/shape.h FILE: ../../../third_party/skia/modules/skplaintexteditor/src/stringslice.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.cpp FILE: ../../../third_party/skia/modules/skplaintexteditor/src/word_boundaries.h +FILE: ../../../third_party/skia/samplecode/SampleTessellatedWedge.cpp FILE: ../../../third_party/skia/src/core/SkMalloc.cpp FILE: ../../../third_party/skia/src/core/SkPixelRefPriv.h FILE: ../../../third_party/skia/src/core/SkTextBlobTrace.cpp @@ -5085,6 +5086,16 @@ FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.cp FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpEffect.h FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.cpp FILE: ../../../third_party/skia/src/gpu/effects/generated/GrComposeLerpRedEffect.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCenterWedgePatchGen.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrCoverShader.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrGpuTessellationPathRenderer.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellatePathOp.h +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.cpp +FILE: ../../../third_party/skia/src/gpu/tessellate/GrTessellateWedgeShader.h FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.cpp FILE: ../../../third_party/skia/src/pdf/SkPDFGraphicStackState.h FILE: ../../../third_party/skia/src/pdf/SkPDFType1Font.cpp @@ -6526,6 +6537,43 @@ 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/core/SkVM_fwd.h + ../../../third_party/skia/LICENSE +TYPE: LicenseType.bsd +FILE: ../../../third_party/skia/src/core/SkVM_fwd.h +---------------------------------------------------------------------------------------------------- +Copyright 2020 Google LLC + +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/src/gpu/GrDistanceFieldGenFromVector.cpp + ../../../third_party/skia/LICENSE @@ -6764,4 +6812,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: 54 +Total license count: 55 diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index bbb992be8b3ec..6aebfd8345568 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -12551,6 +12551,38 @@ 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: + + * 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 LLC + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: