From 95cf94ec4662a5f2e99f0b04bf53542c06f0f8ae Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 17 Jun 2020 13:16:09 -0700 Subject: [PATCH] Revert "Roll Skia from de175abede4d to 32d5cfa1f35e (15 revisions) (#19005)" Caused an iOS-specific crash on startup wherein no fonts are loaded. That crash was bisected to a Skia font manager build rules refactoring: https://skia-review.googlesource.com/c/skia/+/295437 which doesn't appear to take into account iOS. This reverts commit 45386229e2ba5cb28e56dd6c5952394ca72eeccc. --- DEPS | 2 +- ci/licenses_golden/licenses_skia | 54 +++----------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) diff --git a/DEPS b/DEPS index 5937801506ded..3cdc4e866cc57 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': '8346834d7cfc271b30fac001b44f6615ce2365bf', + 'skia_revision': 'de175abede4da2aac2d56811881e4009a0a2eb01', # 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 3ff65975aac79..4b0eef70bfc08 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: 913c90a85a794444797fb635e3cbbfe7 +Signature: 0e85ee99b3e068b1d853679309e6c270 UNUSED LICENSES: @@ -1320,9 +1320,6 @@ FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/confetti.json FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/drinks.json FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/lego_loader.json FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/onboarding.json -FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_1500x959.jpg -FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_512x512.png -FILE: ../../../third_party/skia/modules/canvaskit/perf/assets/test_64x64.png FILE: ../../../third_party/skia/modules/canvaskit/perf/canvas.bench.js FILE: ../../../third_party/skia/modules/canvaskit/perf/matrix.bench.js FILE: ../../../third_party/skia/modules/canvaskit/postamble.js @@ -2536,6 +2533,8 @@ FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.cpp FILE: ../../../third_party/skia/src/gpu/text/GrTextBlob.h FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.cpp FILE: ../../../third_party/skia/src/gpu/text/GrTextBlobCache.h +FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.cpp +FILE: ../../../third_party/skia/src/gpu/text/GrTextContext.h FILE: ../../../third_party/skia/src/gpu/text/GrTextTarget.h FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.cpp FILE: ../../../third_party/skia/src/gpu/vk/GrVkBuffer.h @@ -3494,8 +3493,6 @@ FILE: ../../../third_party/skia/src/gpu/ops/GrQuadPerEdgeAA.cpp FILE: ../../../third_party/skia/src/gpu/ops/GrQuadPerEdgeAA.h FILE: ../../../third_party/skia/src/gpu/ops/GrStrokeRectOp.cpp FILE: ../../../third_party/skia/src/gpu/ops/GrStrokeRectOp.h -FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeGeometry.cpp -FILE: ../../../third_party/skia/src/gpu/tessellate/GrStrokeGeometry.h FILE: ../../../third_party/skia/src/gpu/text/GrAtlasManager.cpp FILE: ../../../third_party/skia/src/gpu/text/GrAtlasManager.h FILE: ../../../third_party/skia/src/gpu/text/GrSDFMaskFilter.cpp @@ -3903,7 +3900,6 @@ FILE: ../../../third_party/skia/gm/crbug_1041204.cpp FILE: ../../../third_party/skia/gm/crbug_224618.cpp FILE: ../../../third_party/skia/gm/encode_color_types.cpp FILE: ../../../third_party/skia/gm/userfont.cpp -FILE: ../../../third_party/skia/gm/ycbcrimage.cpp FILE: ../../../third_party/skia/include/gpu/GrBackendSurfaceMutableState.h FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DBackendContext.h FILE: ../../../third_party/skia/include/gpu/d3d/GrD3DTypes.h @@ -3916,7 +3912,6 @@ FILE: ../../../third_party/skia/src/core/SkIDChangeListener.cpp FILE: ../../../third_party/skia/src/core/SkMatrixProvider.h FILE: ../../../third_party/skia/src/core/SkVM_fwd.h FILE: ../../../third_party/skia/src/gpu/GrBackendSurfaceMutableStateImpl.h -FILE: ../../../third_party/skia/src/gpu/GrBackendUtils.h FILE: ../../../third_party/skia/src/gpu/GrBlockAllocator.cpp FILE: ../../../third_party/skia/src/gpu/GrBlockAllocator.h FILE: ../../../third_party/skia/src/gpu/GrManagedResource.cpp @@ -5234,7 +5229,6 @@ FILE: ../../../third_party/skia/gm/skbug_9819.cpp FILE: ../../../third_party/skia/gm/strokerect_anisotropic.cpp FILE: ../../../third_party/skia/gm/verifiers/gmverifier.cpp FILE: ../../../third_party/skia/gm/verifiers/gmverifier.h -FILE: ../../../third_party/skia/gm/widebuttcaps.cpp FILE: ../../../third_party/skia/include/core/SkM44.h FILE: ../../../third_party/skia/include/effects/SkStrokeAndFillPathEffect.h FILE: ../../../third_party/skia/include/private/SkOpts_spi.h @@ -5285,7 +5279,6 @@ FILE: ../../../third_party/skia/src/core/SkVerticesPriv.h FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.cpp FILE: ../../../third_party/skia/src/gpu/GrDynamicAtlas.h FILE: ../../../third_party/skia/src/gpu/GrEagerVertexAllocator.h -FILE: ../../../third_party/skia/src/gpu/GrHashMapWithCache.h FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.cpp FILE: ../../../third_party/skia/src/gpu/GrStagingBuffer.h FILE: ../../../third_party/skia/src/gpu/ccpr/GrAutoMapVertexBuffer.h @@ -5300,8 +5293,6 @@ FILE: ../../../third_party/skia/src/gpu/tessellate/GrMidpointContourParser.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrResolveLevelCounter.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrVectorXform.h FILE: ../../../third_party/skia/src/gpu/tessellate/GrWangsFormula.h -FILE: ../../../third_party/skia/src/gpu/text/GrSDFTOptions.cpp -FILE: ../../../third_party/skia/src/gpu/text/GrSDFTOptions.h FILE: ../../../third_party/skia/src/opts/SkOpts_skx.cpp FILE: ../../../third_party/skia/src/ports/SkScalerContext_mac_ct.h FILE: ../../../third_party/skia/src/ports/SkTypeface_mac_ct.h @@ -5729,43 +5720,6 @@ 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/fuzz/oss_fuzz/FuzzSVG.cpp + ../../../third_party/skia/LICENSE -TYPE: LicenseType.bsd -FILE: ../../../third_party/skia/fuzz/oss_fuzz/FuzzSVG.cpp ----------------------------------------------------------------------------------------------------- -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/gm/circles.cpp + ../../../third_party/skia/LICENSE @@ -7177,4 +7131,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: 59 +Total license count: 58