DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Roll src/third_party/skia c9873a5f8b8e..f3ebd312f213 (14 commits) (#6290)" as it broke Windows buildbot. (flutter/engine#6292)

Browse Source 
This reverts commit e26a0b4196ead1dee7ccb9d3cfd533a75f2fedfe.
This commit is contained in:
Alexander Aprelev 2018-09-20 16:13:55 -07:00 committed by GitHub
parent 3e05aa6f84
commit 531e419829
2 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -23,7 +23,7 @@ vars = {
'fuchsia_git': 'https://fuchsia.googlesource.com',
'github_git': 'https://github.com',
'skia_git': 'https://skia.googlesource.com',
'skia_revision': 'f3ebd312f21325f9afc4479fd7a4e90a32ffb920',
'skia_revision': 'c9873a5f8b8ed5a6f69d656ed725a31f940da254',
# When updating the Dart revision, ensure that all entries that are
# dependencies of Dart are also updated to match the entries in the

80
engine/src/flutter/ci/licenses_golden/licenses_skia
View File

@ -1,4 +1,4 @@
Signature: 5f132cdc8fff1ec848c51ebfed97bf56
Signature: 9be6317c5de5ac1d9e0e68bd0ff50a11
UNUSED LICENSES:
@ -1130,7 +1130,7 @@ FILE: ../../../third_party/skia/src/opts/SkOpts_sse42.cpp
FILE: ../../../third_party/skia/src/opts/SkSwizzler_opts.h
FILE: ../../../third_party/skia/src/pdf/SkBitmapKey.h
FILE: ../../../third_party/skia/src/pdf/SkPDFConvertType1FontStream.h
FILE: ../../../third_party/skia/src/pdf/SkPDFDocumentPriv.h
FILE: ../../../third_party/skia/src/pdf/SkPDFDocument.h
FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
FILE: ../../../third_party/skia/src/pdf/SkPDFMakeCIDGlyphWidthsArray.h
FILE: ../../../third_party/skia/src/pdf/SkPDFMakeToUnicodeCmap.h
@ -4198,7 +4198,6 @@ FILE: ../../../third_party/skia/include/core/SkFontArguments.h
FILE: ../../../third_party/skia/include/core/SkSerialProcs.h
FILE: ../../../third_party/skia/include/core/SkSurfaceCharacterization.h
FILE: ../../../third_party/skia/include/core/SkVertices.h
FILE: ../../../third_party/skia/include/docs/SkXPSDocument.h
FILE: ../../../third_party/skia/include/effects/SkHighContrastFilter.h
FILE: ../../../third_party/skia/include/effects/SkToSRGBColorFilter.h
FILE: ../../../third_party/skia/include/encode/SkEncoder.h
@ -4215,7 +4214,6 @@ FILE: ../../../third_party/skia/include/private/SkImageInfoPriv.h
FILE: ../../../third_party/skia/include/private/SkMalloc.h
FILE: ../../../third_party/skia/include/private/SkShadowFlags.h
FILE: ../../../third_party/skia/include/utils/SkShadowUtils.h
FILE: ../../../third_party/skia/modules/skottie/gm/SkottieGM.cpp
FILE: ../../../third_party/skia/modules/skottie/include/Skottie.h
FILE: ../../../third_party/skia/modules/skottie/src/Skottie.cpp
FILE: ../../../third_party/skia/modules/skottie/src/SkottieAnimator.cpp
@ -4526,6 +4524,7 @@ FILE: ../../../third_party/skia/src/utils/SkShadowTessellator.h
FILE: ../../../third_party/skia/src/utils/SkShadowUtils.cpp
FILE: ../../../third_party/skia/src/utils/SkThreadUtils_pthread.cpp
FILE: ../../../third_party/skia/src/utils/SkThreadUtils_win.cpp
FILE: ../../../third_party/skia/src/xps/SkXPSDocument.h
----------------------------------------------------------------------------------------------------
Copyright 2017 Google Inc.
@ -5133,43 +5132,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/include/docs/SkPDFDocument.h + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/include/docs/SkPDFDocument.h
FILE: ../../../third_party/skia/src/utils/SkUTF.cpp
FILE: ../../../third_party/skia/src/utils/SkUTF.h
----------------------------------------------------------------------------------------------------
Copyright 2018 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 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/include/effects/SkPictureImageFilter.h + ../../../third_party/skia/LICENSE
@ -6025,6 +5987,42 @@ The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Materials.
====================================================================================================
====================================================================================================
LIBRARY: skia
ORIGIN: ../../../third_party/skia/src/utils/SkUTF.cpp + ../../../third_party/skia/LICENSE
TYPE: LicenseType.bsd
FILE: ../../../third_party/skia/src/utils/SkUTF.cpp
FILE: ../../../third_party/skia/src/utils/SkUTF.h
----------------------------------------------------------------------------------------------------
Copyright 2018 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 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: vulkanmemoryallocator
ORIGIN: ../../../third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt