diff --git a/DEPS b/DEPS index 46438c50e89fa..2803f4ea02e55 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { 'flutter_git': 'https://flutter.googlesource.com', 'skia_git': 'https://skia.googlesource.com', 'llvm_git': 'https://llvm.googlesource.com', - 'skia_revision': 'f784f78a5669962a23243ff67997239a64ce8c99', + 'skia_revision': 'refs/changes/18/935918/2', # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version. diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia index 3f208e82489dd..2a6f62614c567 100644 --- a/ci/licenses_golden/licenses_skia +++ b/ci/licenses_golden/licenses_skia @@ -1,4 +1,4 @@ -Signature: d7670af6cbef9d04a3bfe4d89e3f3b51 +Signature: 6d7b1b940bc37c8dd57bffdb67085983 ==================================================================================================== LIBRARY: etc1 @@ -321,7 +321,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================================================================================== ==================================================================================================== -LIBRARY: libmicrohttpd LIBRARY: skia ORIGIN: ../../../flutter/third_party/skia/LICENSE TYPE: LicenseType.bsd @@ -399,12 +398,6 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html FILE: ../../../flutter/third_party/skia/package-lock.json -FILE: ../../../flutter/third_party/skia/relnotes/GpuStats.md -FILE: ../../../flutter/third_party/skia/relnotes/GraphiteLogPriority.md -FILE: ../../../flutter/third_party/skia/relnotes/SkColorSpaceMakeCICP.md -FILE: ../../../flutter/third_party/skia/relnotes/debugtrace.md -FILE: ../../../flutter/third_party/skia/relnotes/precompilecontext.md -FILE: ../../../flutter/third_party/skia/relnotes/requireorderedrecordings.md FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml FILE: ../../../flutter/third_party/skia/src/sksl/generated/sksl_compute.minified.sksl @@ -442,7 +435,6 @@ FILE: ../../../flutter/third_party/skia/src/sksl/sksl_rt_shader.sksl FILE: ../../../flutter/third_party/skia/src/sksl/sksl_shared.sksl FILE: ../../../flutter/third_party/skia/src/sksl/sksl_vert.sksl FILE: ../../../flutter/third_party/skia/third_party/go.mod -FILE: ../../../flutter/third_party/skia/third_party/libmicrohttpd/MHD_config.h FILE: ../../../flutter/third_party/skia/toolchain/linux_trampolines/IWYU_mapping.imp FILE: ../../../flutter/third_party/skia/toolchain/ndk.BUILD FILE: ../../../flutter/third_party/skia/whitespace.txt @@ -3129,8 +3121,6 @@ ORIGIN: ../../../flutter/third_party/skia/include/private/base/SkThreadID.h + .. ORIGIN: ../../../flutter/third_party/skia/include/svg/SkSVGCanvas.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/utils/SkPaintFilterCanvas.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/base/SkSemaphore.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/base/SkSharedMutex.cpp + ../../../flutter/third_party/skia/LICENSE -ORIGIN: ../../../flutter/third_party/skia/src/base/SkSharedMutex.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/base/SkSpinlock.cpp + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/base/SkSpinlock.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/src/base/SkTDPQueue.h + ../../../flutter/third_party/skia/LICENSE @@ -3404,8 +3394,6 @@ FILE: ../../../flutter/third_party/skia/include/private/base/SkThreadID.h FILE: ../../../flutter/third_party/skia/include/svg/SkSVGCanvas.h FILE: ../../../flutter/third_party/skia/include/utils/SkPaintFilterCanvas.h FILE: ../../../flutter/third_party/skia/src/base/SkSemaphore.cpp -FILE: ../../../flutter/third_party/skia/src/base/SkSharedMutex.cpp -FILE: ../../../flutter/third_party/skia/src/base/SkSharedMutex.h FILE: ../../../flutter/third_party/skia/src/base/SkSpinlock.cpp FILE: ../../../flutter/third_party/skia/src/base/SkSpinlock.h FILE: ../../../flutter/third_party/skia/src/base/SkTDPQueue.h @@ -9512,6 +9500,7 @@ ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSur ORIGIN: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h + ../../../flutter/third_party/skia/LICENSE +ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h + ../../../flutter/third_party/skia/LICENSE ORIGIN: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h + ../../../flutter/third_party/skia/LICENSE @@ -9642,6 +9631,7 @@ FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlBackendSurfa FILE: ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/GrMtlDirectContext.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/LogPriority.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/PrecompileContext.h +FILE: ../../../flutter/third_party/skia/include/gpu/graphite/mtl/MtlGraphiteTypesUtils.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PaintOptions.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/Precompile.h FILE: ../../../flutter/third_party/skia/include/gpu/graphite/precompile/PrecompileBase.h diff --git a/sky/packages/sky_engine/LICENSE b/sky/packages/sky_engine/LICENSE index 0105ac26e2d23..799856c464c65 100644 --- a/sky/packages/sky_engine/LICENSE +++ b/sky/packages/sky_engine/LICENSE @@ -22053,7 +22053,6 @@ 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. -------------------------------------------------------------------------------- -libmicrohttpd skia Copyright (c) 2011 Google Inc. All rights reserved.