DM/PDF: stop adding unused rasterizer keywords
We can always add it back if we need it in the future.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852713002
Review URL: https://codereview.chromium.org/1852713002
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 07e594b..97b6eb8 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -850,8 +850,7 @@
SINK("8888", RasterSink, kN32_SkColorType);
SINK("srgb", RasterSink, kN32_SkColorType, kSRGB_SkColorProfileType);
SINK("f16", RasterSink, kRGBA_F16_SkColorType);
- SINK("pdf", PDFSink, "Pdfium");
- SINK("pdf_poppler", PDFSink, "Poppler");
+ SINK("pdf", PDFSink);
SINK("skp", SKPSink);
SINK("svg", SVGSink);
SINK("null", NullSink);
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 6584789..5f8727f 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1074,8 +1074,6 @@
return "";
}
-PDFSink::PDFSink(const char* rasterizer) : fRasterizer(rasterizer) {}
-
Error PDFSink::draw(const Src& src, SkBitmap*, SkWStream* dst, SkString*) const {
SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(dst));
if (!doc) {
@@ -1086,9 +1084,6 @@
info.emplace_back(SkString("Subject"),
SkString("rendering correctness test"));
info.emplace_back(SkString("Creator"), SkString("Skia/DM"));
-
- info.emplace_back(SkString("Keywords"),
- SkStringPrintf("Rasterizer:%s;", fRasterizer));
doc->setMetadata(&info[0], info.count(), nullptr, nullptr);
return draw_skdocument(src, doc.get(), dst);
}
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 3a35acf..c4df845 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -253,13 +253,9 @@
class PDFSink : public Sink {
public:
- PDFSink(const char* rasterizer);
-
Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
const char* fileExtension() const override { return "pdf"; }
SinkFlags flags() const override { return SinkFlags{ SinkFlags::kVector, SinkFlags::kDirect }; }
-private:
- const char* fRasterizer;
};
class XPSSink : public Sink {
diff --git a/tests/TestConfigParsing.cpp b/tests/TestConfigParsing.cpp
index 4057a37..25edec4 100644
--- a/tests/TestConfigParsing.cpp
+++ b/tests/TestConfigParsing.cpp
@@ -70,7 +70,7 @@
SkCommandLineFlags::StringArray config1 = make_string_array({
"565", "8888", "debug", "gpu", "gpudebug", "gpudft", "gpunull", "msaa16", "msaa4",
"nonrendering", "null", "nullgpu", "nvpr16", "nvpr4", "nvprdit16", "nvprdit4", "pdf",
- "pdf_poppler", "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui",
+ "skp", "svg", "xps", "angle", "angle-gl", "commandbuffer", "mesa", "hwui",
"gpuf16", "gpusrgb"
});
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 1931176..4695445 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -6,7 +6,6 @@
"gpu",
"gpusrgb",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2038,7 +2037,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2384,7 +2382,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2638,7 +2635,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -2863,7 +2859,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -3085,7 +3080,6 @@
"2ndpic-8888",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -3326,7 +3320,6 @@
"nvprdit16",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
@@ -3660,7 +3653,6 @@
"gpusrgb",
"msaa16",
"pdf",
- "pdf_poppler",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 0296c3a..5c22a33 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -63,7 +63,6 @@
# Runs out of memory on Android bots and Daisy. Everyone else seems fine.
if 'Android' not in bot and 'Daisy' not in bot:
configs.append('pdf')
- configs.append('pdf_poppler')
# NP is running out of RAM when we run all these modes. skia:3255
if 'NexusPlayer' not in bot:
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index 1ee3130..7d43207 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -28,7 +28,7 @@
static const char configHelp[] =
"Options: 565 8888 debug gpu gpudebug gpudft gpunull "
"msaa16 msaa4 gpuf16 gpusrgb nonrendering null nullgpu "
- "nvpr16 nvpr4 nvprdit16 nvprdit4 pdf pdf_poppler skp svg xps"
+ "nvpr16 nvpr4 nvprdit16 nvprdit4 pdf skp svg xps"
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
" angle"