38921cafe1
This reverts commitb81842aa28
. Reason for revert: reland with fixes Original change's description: > Revert "[skottie] Add image sampling and transform options" > > This reverts commit2f24405250
. > > Reason for revert: broke Win/shared > > Original change's description: > > [skottie] Add image sampling and transform options > > > > Expand the SkImageAsset API to support controlling sampling options and > > pass an additional transform. > > > > Bug: skia:10944, skia:10942 > > Change-Id: I7bad0b2ab58ed40fe4b425de0eb6970a4c7d7117 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340097 > > Commit-Queue: Florin Malita <fmalita@chromium.org> > > Commit-Queue: Florin Malita <fmalita@google.com> > > Reviewed-by: Mike Reed <reed@google.com> > > TBR=fmalita@chromium.org,fmalita@google.com,reed@google.com,aparchur@google.com > > Change-Id: I59d4161356ffdc20588f1bd3beb33c54e44807a2 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10944 > Bug: skia:10942 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340619 > Reviewed-by: Florin Malita <fmalita@google.com> > Commit-Queue: Florin Malita <fmalita@google.com> TBR=fmalita@chromium.org,fmalita@google.com,reed@google.com,aparchur@google.com # Not skipping CQ checks because this is a reland. Bug: skia:10944 Bug: skia:10942 Change-Id: I91892f4db6366ceb07d1a49a7bc54da17cea5399 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340657 Reviewed-by: Mike Reed <reed@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@google.com>
151 lines
3.1 KiB
Plaintext
151 lines
3.1 KiB
Plaintext
# Copyright 2018 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
import("../../gn/skia.gni")
|
|
|
|
if (skia_enable_skottie) {
|
|
config("public_config") {
|
|
defines = [ "SK_ENABLE_SKOTTIE" ]
|
|
include_dirs = [ "include" ]
|
|
}
|
|
|
|
component("skottie") {
|
|
check_includes = false
|
|
import("skottie.gni")
|
|
public_configs = [ ":public_config" ]
|
|
public = skia_skottie_public
|
|
sources = skia_skottie_sources
|
|
configs += [ "../../:skia_private" ]
|
|
deps = [
|
|
"../..:skia",
|
|
"../skresources",
|
|
"../sksg",
|
|
"../skshaper",
|
|
]
|
|
}
|
|
|
|
if (defined(is_skia_standalone)) {
|
|
config("utils_config") {
|
|
include_dirs = [ "utils" ]
|
|
}
|
|
source_set("utils") {
|
|
check_includes = false
|
|
testonly = true
|
|
|
|
public_configs = [ ":utils_config" ]
|
|
configs += [ "../../:skia_private" ]
|
|
|
|
sources = [ "utils/SkottieUtils.cpp" ]
|
|
deps = [
|
|
":skottie",
|
|
"../..:skia",
|
|
]
|
|
}
|
|
|
|
if (skia_enable_tools) {
|
|
source_set("tests") {
|
|
testonly = true
|
|
|
|
configs += [
|
|
"../..:skia_private",
|
|
"../..:tests_config",
|
|
]
|
|
sources = [
|
|
"src/SkottieTest.cpp",
|
|
"tests/AudioLayer.cpp",
|
|
"tests/Image.cpp",
|
|
"tests/Keyframe.cpp",
|
|
"tests/Text.cpp",
|
|
]
|
|
|
|
deps = [
|
|
":skottie",
|
|
"../..:gpu_tool_utils",
|
|
"../..:skia",
|
|
"../skshaper",
|
|
]
|
|
}
|
|
|
|
source_set("fuzz") {
|
|
check_includes = false
|
|
testonly = true
|
|
|
|
configs += [ "../..:skia_private" ]
|
|
include_dirs = [
|
|
"../../tools",
|
|
"../../tools/flags",
|
|
"../../tools/fonts",
|
|
]
|
|
sources = [
|
|
"../../tools/Resources.cpp",
|
|
"../../tools/fonts/TestFontMgr.cpp",
|
|
"../../tools/fonts/TestSVGTypeface.cpp",
|
|
"../../tools/fonts/TestTypeface.cpp",
|
|
"fuzz/FuzzSkottieJSON.cpp",
|
|
]
|
|
|
|
deps = [
|
|
"../..:skia",
|
|
"../svg",
|
|
]
|
|
|
|
public_deps = [ ":skottie" ]
|
|
}
|
|
|
|
source_set("tool") {
|
|
check_includes = false
|
|
testonly = true
|
|
|
|
configs += [ "../..:skia_private" ]
|
|
sources = [ "src/SkottieTool.cpp" ]
|
|
|
|
deps = [
|
|
"../..:flags",
|
|
"../..:skia",
|
|
"../../experimental/ffmpeg:video_encoder",
|
|
]
|
|
|
|
public_deps = [
|
|
":skottie",
|
|
":utils",
|
|
]
|
|
}
|
|
|
|
source_set("gm") {
|
|
check_includes = false
|
|
testonly = true
|
|
|
|
# would be nice to have a gm_config
|
|
include_dirs = [ "../../gm" ]
|
|
|
|
configs += [ "../..:skia_private" ]
|
|
sources = [
|
|
"gm/ExternalProperties.cpp",
|
|
"gm/SkottieGM.cpp",
|
|
]
|
|
|
|
deps = [
|
|
":skottie",
|
|
":utils",
|
|
"../..:gpu_tool_utils",
|
|
"../..:skia",
|
|
"../..:tool_utils",
|
|
]
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
group("skottie") {
|
|
}
|
|
group("fuzz") {
|
|
}
|
|
group("gm") {
|
|
}
|
|
group("tests") {
|
|
}
|
|
group("utils") {
|
|
}
|
|
}
|