AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation with "skia_enable_skparagraph = false"

Browse Source 
Change-Id: I034d841618fbf878223c82ec30f0ad37678d737e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443899
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Reviewed-by: Florin Malita <fmalita@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2021-08-31 12:36:25 -04:00 committed by SkCQ
parent 0e32aa8a3a
commit be2c3ee05d
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bench/ParagraphBench.cpp
View File

@ -12,6 +12,8 @@
#include "include/core/SkString.h" #include "include/core/SkString.h"
#include "tools/Resources.h" #include "tools/Resources.h"
#if defined(SK_ENABLE_PARAGRAPH)
#include "modules/skparagraph/include/FontCollection.h" #include "modules/skparagraph/include/FontCollection.h"
#include "modules/skparagraph/include/ParagraphBuilder.h" #include "modules/skparagraph/include/ParagraphBuilder.h"
#include "modules/skparagraph/include/ParagraphStyle.h" #include "modules/skparagraph/include/ParagraphStyle.h"
@ -92,3 +94,5 @@ private:
}; };
DEF_BENCH( return new ParagraphBench; ) DEF_BENCH( return new ParagraphBench; )
#endif // SK_ENABLE_PARAGRAPH

4
fuzz/FuzzSkParagraph.cpp
View File

@ -52,6 +52,8 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#if defined(SK_ENABLE_PARAGRAPH)
using namespace skia::textlayout; using namespace skia::textlayout;
namespace { namespace {
const uint8_t MAX_TEXT_LENGTH = 255; const uint8_t MAX_TEXT_LENGTH = 255;
@ -280,3 +282,5 @@ DEF_FUZZ(SkParagraph, fuzz) {
paragraph->layout(layout_width); paragraph->layout(layout_width);
paragraph->paint(&canvas, 0, 0); paragraph->paint(&canvas, 0, 0);
} }
#endif // SK_ENABLE_PARAGRAPH

4
fuzz/oss_fuzz/FuzzSkParagraph.cpp
View File

@ -7,6 +7,8 @@
#include "fuzz/Fuzz.h" #include "fuzz/Fuzz.h"
#if defined(SK_ENABLE_PARAGRAPH)
void fuzz_SkParagraph(Fuzz* f); void fuzz_SkParagraph(Fuzz* f);
extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
@ -17,3 +19,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
fuzz_SkParagraph(&fuzz); fuzz_SkParagraph(&fuzz);
return 0; return 0;
} }
#endif

1
modules/skparagraph/BUILD.gn
View File

@ -13,6 +13,7 @@ declare_args() {
if (skia_enable_skparagraph && skia_enable_skshaper && skia_use_icu && if (skia_enable_skparagraph && skia_enable_skshaper && skia_use_icu &&
skia_use_harfbuzz) { skia_use_harfbuzz) {
config("public_config") { config("public_config") {
defines = [ "SK_ENABLE_PARAGRAPH" ]
include_dirs = [ include_dirs = [
"include", "include",
"utils", "utils",