Clarify what the "default" renderer is in CFX_DefaultRenderDevice
In CFX_DefaultRenderDevice, rename SkiaIsDefaultRenderer() to
UseSkiaRenderer(), since this method returns the current renderer, which
may have been chosen at runtime. Whereas the true default renderer is
always Skia for Skia-enabled builds. Add a `kDefaultRenderer` constant
to represent that.
Rename SetDefaultRenderer() to SetRendererType() to match, and also
rename `g_default_renderer_type` to `g_renderer_type`.
These renames will make fixing the bug associated with this CL easier.
As this resolves what "default" really means.
Bug: pdfium:2087
Change-Id: I1ccc5526b05253cafa73e242b615ca9f75d34113
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/113090
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_pageimagecache.cpp b/core/fpdfapi/page/cpdf_pageimagecache.cpp
index 30d6aa1..2518b08 100644
--- a/core/fpdfapi/page/cpdf_pageimagecache.cpp
+++ b/core/fpdfapi/page/cpdf_pageimagecache.cpp
@@ -102,7 +102,7 @@
RetainPtr<CFX_DIBBase> MakeCachedImage(RetainPtr<CFX_DIBBase> image,
bool realize_hint) {
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Ignore `realize_hint`, as `RealizeSkImage()` doesn't benefit from it.
return pdfium::MakeRetain<CachedImage>(std::move(image));
}
diff --git a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
index db573c0..4c9a016 100644
--- a/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
+++ b/core/fpdfapi/parser/cpdf_security_handler_embeddertest.cpp
@@ -142,7 +142,7 @@
TEST_F(CPDFSecurityHandlerEmbedderTest, PasswordAfterGenerateSave) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "caa4bfda016a9c48a540ff7c6716468c";
#elif BUILDFLAG(IS_APPLE)
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index e9e94dc..1efa7e9 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -54,7 +54,7 @@
void ClearBitmap(CFX_DefaultRenderDevice& bitmap_device, uint32_t color) {
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
bitmap_device.Clear(color);
return;
}
@@ -366,7 +366,7 @@
DCHECK(!bitmap_device2.GetBitmap()->HasPalette());
bitmap_device2.GetBitmap()->ConvertFormat(FXDIB_Format::k8bppMask);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer() &&
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer() &&
m_pRenderStatus->GetRenderDevice()->SetBitsWithMask(
bitmap_device1.GetBitmap(), bitmap_device2.GetBitmap(), rect.left,
rect.top, m_BitmapAlpha, m_BlendType)) {
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index a4df7be..8e3066d 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -114,8 +114,9 @@
#if BUILDFLAG(IS_APPLE)
return FXDIB_Format::kRgb32;
#else
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return FXDIB_Format::kRgb32;
+ }
return FXDIB_Format::kRgb;
#endif
}
@@ -650,7 +651,7 @@
bitmap_render.Initialize(nullptr, nullptr);
bitmap_render.ProcessObjectNoClip(pPageObj, new_matrix);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Safe because `CFX_SkiaDeviceDriver` always uses pre-multiplied alpha.
// TODO(crbug.com/pdfium/2011): Remove the need for this.
bitmap_device.GetBitmap()->ForcePreMultiply();
@@ -677,7 +678,7 @@
transparency.SetGroup();
}
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
bitmap_device.GetBitmap()->UnPreMultiply();
}
#endif
@@ -1195,7 +1196,7 @@
if (blend_mode == BlendMode::kNormal) {
if (!pDIBitmap->IsMaskFormat()) {
if (bitmap_alpha < 255) {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
std::unique_ptr<CFX_ImageRenderer> dummy;
CFX_Matrix m = CFX_RenderDevice::GetFlipMatrix(
pDIBitmap->GetWidth(), pDIBitmap->GetHeight(), left, top);
diff --git a/core/fpdfapi/render/cpdf_rendertiling.cpp b/core/fpdfapi/render/cpdf_rendertiling.cpp
index 5f9dcd7..64b7acc 100644
--- a/core/fpdfapi/render/cpdf_rendertiling.cpp
+++ b/core/fpdfapi/render/cpdf_rendertiling.cpp
@@ -60,8 +60,9 @@
context.Render(&bitmap_device, nullptr, &options, nullptr);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
+ }
#endif // defined(_SKIA_SUPPORT_)
return pBitmap;
}
diff --git a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
index da11587..3f85d5d 100644
--- a/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_progressive_render_embeddertest.cpp
@@ -24,7 +24,7 @@
constexpr FX_ARGB kWhite = 0xFFFFFFFF;
const char* AnnotationStampWithApBaseContentChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "7f8437212ef1cd33ff505ece5a7e99f8";
#elif BUILDFLAG(IS_APPLE)
@@ -321,7 +321,7 @@
TEST_F(FPDFProgressiveRenderEmbedderTest, RenderTextWithColorScheme) {
// Test rendering of text with forced color scheme on.
const char* content_with_text_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "e970b97a719ce4d8efdfcbc316255aac";
#elif BUILDFLAG(IS_APPLE)
@@ -347,8 +347,9 @@
TEST_F(FPDFProgressiveRenderEmbedderTest, RenderPathWithColorScheme) {
// Test rendering of paths with forced color scheme on.
const char* rectangles_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "4b0f850a94698d07b6cd2814d1b4ccb7";
+ }
return "249f59b0d066c4f6bd89782a80822219";
}();
@@ -364,8 +365,9 @@
// Test rendering of paths with forced color scheme on and conversion from
// fill to stroke enabled. The fill paths should be rendered as stroke.
const char* rectangles_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "c1cbbd2ce6921f608a3c55140592419b";
+ }
return "0ebcc11e617635eca1fa9ce475383a80";
}();
@@ -384,7 +386,7 @@
// path since highlights have Multiply blend mode, while the other path has
// Normal blend mode.
const char* content_with_highlight_fill_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "8ed2cbc6a362752fabdf9b50d3358c96";
#elif BUILDFLAG(IS_APPLE)
@@ -418,7 +420,7 @@
// Normal blend mode.
const char* md5_content_with_highlight = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "9389330c006d3e6054057992624684a8";
#elif BUILDFLAG(IS_APPLE)
@@ -445,7 +447,7 @@
TEST_F(FPDFProgressiveRenderEmbedderTest, RenderInkWithColorScheme) {
// Test rendering of multiple ink with forced color scheme on.
const char* content_with_ink_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "f6dfec1a38800973e57bba5da4fe77fe";
#elif BUILDFLAG(IS_APPLE)
@@ -467,7 +469,7 @@
TEST_F(FPDFProgressiveRenderEmbedderTest, RenderStampWithColorScheme) {
// Test rendering of static annotation with forced color scheme on.
const char* content_with_stamp_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "9365cd179a0109640bb2b7456f211524";
#elif BUILDFLAG(IS_APPLE)
@@ -493,8 +495,9 @@
TEST_F(FPDFProgressiveRenderEmbedderTest, RenderFormWithColorScheme) {
// Test rendering of form does not change with forced color scheme on.
const char* content_with_form_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "9f75d98afc6d6313bd87e6562ea6df15";
+ }
return "080f7a4381606659301440e1b14dca35";
}();
diff --git a/core/fxge/cfx_defaultrenderdevice.cpp b/core/fxge/cfx_defaultrenderdevice.cpp
index 819be4e..4da848a 100644
--- a/core/fxge/cfx_defaultrenderdevice.cpp
+++ b/core/fxge/cfx_defaultrenderdevice.cpp
@@ -13,16 +13,16 @@
// When build variant is Skia then it is assumed as the default, but might be
// overridden at runtime.
#if defined(_SKIA_SUPPORT_)
-CFX_DefaultRenderDevice::RendererType g_default_renderer_type =
- CFX_DefaultRenderDevice::RendererType::kSkia;
+CFX_DefaultRenderDevice::RendererType g_renderer_type =
+ CFX_DefaultRenderDevice::kDefaultRenderer;
#endif
} // namespace
// static
-bool CFX_DefaultRenderDevice::SkiaIsDefaultRenderer() {
+bool CFX_DefaultRenderDevice::UseSkiaRenderer() {
#if defined(_SKIA_SUPPORT_)
- return g_default_renderer_type == RendererType::kSkia;
+ return g_renderer_type == RendererType::kSkia;
#else
return false;
#endif
@@ -30,8 +30,8 @@
#if defined(_SKIA_SUPPORT_)
// static
-void CFX_DefaultRenderDevice::SetDefaultRenderer(RendererType renderer_type) {
- g_default_renderer_type = renderer_type;
+void CFX_DefaultRenderDevice::SetRendererType(RendererType renderer_type) {
+ g_renderer_type = renderer_type;
}
#endif
@@ -63,7 +63,7 @@
RetainPtr<CFX_DIBitmap> pBackdropBitmap,
bool bGroupKnockout) {
#if defined(_SKIA_SUPPORT_)
- if (SkiaIsDefaultRenderer()) {
+ if (UseSkiaRenderer()) {
return AttachSkiaImpl(std::move(pBitmap), bRgbByteOrder,
std::move(pBackdropBitmap), bGroupKnockout);
}
@@ -77,8 +77,9 @@
FXDIB_Format format,
RetainPtr<CFX_DIBitmap> pBackdropBitmap) {
#if defined(_SKIA_SUPPORT_)
- if (SkiaIsDefaultRenderer())
+ if (UseSkiaRenderer()) {
return CreateSkia(width, height, format, pBackdropBitmap);
+ }
#endif
return CreateAgg(width, height, format, pBackdropBitmap);
}
diff --git a/core/fxge/cfx_defaultrenderdevice.h b/core/fxge/cfx_defaultrenderdevice.h
index 4d94b7a..b9ca8f0 100644
--- a/core/fxge/cfx_defaultrenderdevice.h
+++ b/core/fxge/cfx_defaultrenderdevice.h
@@ -38,7 +38,7 @@
#endif
// Runtime check to see if Skia is the renderer variant in use.
- static bool SkiaIsDefaultRenderer();
+ static bool UseSkiaRenderer();
#if defined(_SKIA_SUPPORT_)
// This internal definition of renderer types must stay updated with respect
@@ -50,8 +50,11 @@
kSkia = 1,
};
- // Update default renderer.
- static void SetDefaultRenderer(RendererType renderer_type);
+ // When Skia is enabled at compile time, this constant is assigned as the
+ // default value UseSkiaRenderer() returns. SetRendererType() may override it.
+ static constexpr RendererType kDefaultRenderer = RendererType::kSkia;
+
+ static void SetRendererType(RendererType renderer_type);
#endif // defined(_SKIA_SUPPORT_)
private:
diff --git a/core/fxge/cfx_glyphcache.cpp b/core/fxge/cfx_glyphcache.cpp
index f075bef..5c00df1 100644
--- a/core/fxge/cfx_glyphcache.cpp
+++ b/core/fxge/cfx_glyphcache.cpp
@@ -269,8 +269,8 @@
ByteString FaceGlyphsKey(keygen.key_, keygen.key_len_);
#if BUILDFLAG(IS_APPLE)
- const bool bDoLookUp = !text_options->native_text ||
- CFX_DefaultRenderDevice::SkiaIsDefaultRenderer();
+ const bool bDoLookUp =
+ !text_options->native_text || CFX_DefaultRenderDevice::UseSkiaRenderer();
#else
const bool bDoLookUp = true;
#endif
@@ -280,7 +280,7 @@
}
#if BUILDFLAG(IS_APPLE)
- DCHECK(!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer());
+ DCHECK(!CFX_DefaultRenderDevice::UseSkiaRenderer());
std::unique_ptr<CFX_GlyphBitmap> pGlyphBitmap;
auto it = m_SizeMap.find(FaceGlyphsKey);
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index b1e600d..0d5497f 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -713,7 +713,7 @@
if (fill && fill_alpha && stroke_alpha < 0xff && fill_options.stroke) {
if (m_RenderCaps & FXRC_FILLSTROKE_PATH) {
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
m_pDeviceDriver->SetGroupKnockout(true);
}
#endif
@@ -722,7 +722,7 @@
fill_options, blend_type);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Restore the group knockout status for `m_pDeviceDriver` after
// finishing painting a fill-and-stroke path.
m_pDeviceDriver->SetGroupKnockout(false);
@@ -1032,7 +1032,7 @@
// one expires 10/7/19. This makes LCD anti-aliasing very ugly, so we
// instead fall back on NORMAL anti-aliasing.
anti_alias = FT_RENDER_MODE_NORMAL;
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Since |anti_alias| doesn't affect Skia rendering, and Skia only
// follows strictly to the options provided by |text_options|, we need
// to update |text_options| so that Skia falls back on normal
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index cf349c0..28311c4 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -174,7 +174,7 @@
}
case FXDIB_Format::kRgb32:
case FXDIB_Format::kArgb: {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer() &&
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer() &&
FXDIB_Format::kRgb32 == GetFormat()) {
// TODO(crbug.com/pdfium/2016): This is not reliable because alpha may
// be modified outside of this operation.
diff --git a/core/fxge/skia/fx_skia_device_embeddertest.cpp b/core/fxge/skia/fx_skia_device_embeddertest.cpp
index 91cf8a3..5aa9a76 100644
--- a/core/fxge/skia/fx_skia_device_embeddertest.cpp
+++ b/core/fxge/skia/fx_skia_device_embeddertest.cpp
@@ -207,14 +207,16 @@
} // namespace
TEST(fxge, SkiaStateEmpty) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
Harness(&EmptyTest, {});
}
TEST(fxge, SkiaStatePath) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
Harness(&CommonTest, {State::Change::kNo, State::Save::kYes,
State::Clip::kSame, State::Graphic::kPath, 0xFF112233});
Harness(&CommonTest,
@@ -229,8 +231,9 @@
}
TEST(fxge, SkiaStateText) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
Harness(&CommonTest,
{State::Change::kNo, State::Save::kYes, State::Clip::kDifferentMatrix,
@@ -240,8 +243,9 @@
}
TEST(fxge, SkiaStateOOSClip) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
Harness(&OutOfSequenceClipTest, {});
}
@@ -255,7 +259,7 @@
static constexpr int kPageWidth = kImageWidth / kPageToImageFactor;
static constexpr int kPageHeight = kImageHeight / kPageToImageFactor;
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
GTEST_SKIP() << "Skia is not the default renderer";
}
diff --git a/core/fxge/win32/cgdi_device_driver.cpp b/core/fxge/win32/cgdi_device_driver.cpp
index e6e2c21..03ca78c 100644
--- a/core/fxge/win32/cgdi_device_driver.cpp
+++ b/core/fxge/win32/cgdi_device_driver.cpp
@@ -317,7 +317,7 @@
float* x,
float* y) {
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// TODO(caryclark) temporary replacement of antigrain in line function to
// permit removing antigrain altogether
rect_base rect = {0.0f, 0.0f, w, h};
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index 6897efe..8ddba6a 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -405,8 +405,9 @@
TEST_F(FPDFAnnotEmbedderTest, RenderMultilineMarkupAnnotWithoutAP) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "ec1f4ccbd0aecfdea6d53893387a0101";
+ }
return "76512832d88017668d9acc7aacd13dae";
}();
@@ -547,7 +548,7 @@
}
{
const char* expected_hash = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "d9411907a883f25ba51e71c8359c10fe";
#elif BUILDFLAG(IS_APPLE)
@@ -775,7 +776,7 @@
// Open the saved document.
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "c50012ab122cd3706d39f371ca7462ee";
#elif BUILDFLAG(IS_APPLE)
@@ -900,7 +901,7 @@
TEST_F(FPDFAnnotEmbedderTest, ModifyRectQuadpointsWithAP) {
const char* md5_original = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "3867f6e34e801abad4e98811f6d7b887";
#elif BUILDFLAG(IS_APPLE)
@@ -916,7 +917,7 @@
#endif
}();
const char* md5_modified_highlight = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "a6f6df562dcf96b3670d40fa2999a582";
#elif BUILDFLAG(IS_APPLE)
@@ -932,7 +933,7 @@
#endif
}();
const char* md5_modified_square = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "cebb3bd3209f63f6dfd15b8425229e90";
#elif BUILDFLAG(IS_APPLE)
@@ -1138,7 +1139,7 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyPath) {
const char* md5_modified_path = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "ab475e8230c6aab366073bdb70eb6953";
#elif BUILDFLAG(IS_APPLE)
@@ -1154,7 +1155,7 @@
#endif
}();
const char* md5_two_paths = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "ce7f5271ff51096a15861619fb789d5b";
#elif BUILDFLAG(IS_APPLE)
@@ -1170,7 +1171,7 @@
#endif
}();
const char* md5_new_annot = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "b627d1be207a1f090db9cf122bc198ae";
#elif BUILDFLAG(IS_APPLE)
@@ -1380,7 +1381,7 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyImage) {
const char* md5_new_image = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "5b7ce251f51f50c1c76d3b09c47a87f9";
#elif BUILDFLAG(IS_APPLE)
@@ -1396,7 +1397,7 @@
#endif
}();
const char* md5_modified_image = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "f9af241702961e8ed59306a7084548bf";
#elif BUILDFLAG(IS_APPLE)
@@ -1485,7 +1486,7 @@
TEST_F(FPDFAnnotEmbedderTest, AddAndModifyText) {
const char* md5_new_text = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "2752b71ff3373a8a427fbc4145018ee8";
#elif BUILDFLAG(IS_APPLE)
@@ -1503,7 +1504,7 @@
#endif
}();
const char* md5_modified_text = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "064468521e40694712422c9a1b5212c4";
#elif BUILDFLAG(IS_APPLE)
@@ -1648,7 +1649,7 @@
UnloadPage(page);
const char* md5 = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "5060b231fef2504446a5d44474869326";
#elif BUILDFLAG(IS_APPLE)
@@ -2196,8 +2197,9 @@
TEST_F(FPDFAnnotEmbedderTest, BUG_1206) {
const char* expected_bitmap = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "a1ea1ceebb26922fae576cb79ce63af0";
+ }
return "0d9fc05c6762fd788bd23fd87a4967bc";
}();
static constexpr size_t kExpectedSize = 1593;
@@ -3120,7 +3122,7 @@
{
const char* md5_sum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "911a6dbe2209b5e9e7e0a09b98c12d2e";
#elif BUILDFLAG(IS_APPLE)
@@ -3155,7 +3157,7 @@
{
const char* md5_sum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "27777b11ea1498200b42d00a083a598f";
#elif BUILDFLAG(IS_APPLE)
@@ -3181,7 +3183,7 @@
{
const char* md5_sum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "61594e370efd7cb9097d8036b168ff1f";
#elif BUILDFLAG(IS_APPLE)
@@ -3764,7 +3766,7 @@
EXPECT_EQ(3, FPDFPage_GetAnnotCount(page));
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "36ab186e78c0b88eeb8f7aceea93b72c";
#elif BUILDFLAG(IS_APPLE)
@@ -3780,7 +3782,7 @@
#endif
}();
const char* modified_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "ece1ab24a0d9425ef3b06747c95d75ce";
#elif BUILDFLAG(IS_APPLE)
diff --git a/fpdfsdk/fpdf_doc_embeddertest.cpp b/fpdfsdk/fpdf_doc_embeddertest.cpp
index c49664b..11a37df 100644
--- a/fpdfsdk/fpdf_doc_embeddertest.cpp
+++ b/fpdfsdk/fpdf_doc_embeddertest.cpp
@@ -601,30 +601,30 @@
const PageData expected_page_data[5] = {
{200, 250,
[]() {
- return CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ return CFX_DefaultRenderDevice::UseSkiaRenderer()
? "4b6590a267eae90b8be1607e808fb57f"
: "1e5d1cf19ffbb9cf9dbf099483cea327";
}()},
{250, 200,
[]() {
- return CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ return CFX_DefaultRenderDevice::UseSkiaRenderer()
? "e8edd3655f6629ff489bd8c3bb110c82"
: "65c80685916aa36e767dd2270ba4d72b";
}()},
{200, 250,
[]() {
- return CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ return CFX_DefaultRenderDevice::UseSkiaRenderer()
? "a2bde6b68d7981e665ab25bc633746aa"
: "a53b21c68edf43c1cddb5c06e361bb45";
}()},
{200, 250,
[]() {
- return CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ return CFX_DefaultRenderDevice::UseSkiaRenderer()
? "a8c5b3e626f665eddf593c6d4c32ae9e"
: "dcd768be15efb9c6e5093cf74508752c";
}()},
{200, 250, []() {
- return CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ return CFX_DefaultRenderDevice::UseSkiaRenderer()
? "72eb157853ae2d19b70ea62e3f5ac202"
: "7a3f8f79ebcb350854c0d69607729ec5";
}()}};
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index eda0576..2f29e3d 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -49,7 +49,7 @@
const wchar_t kBottomText[] = L"I'm at the bottom of the page";
const char* BottomTextChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "5d8f2b613a2f9591a52373c72d6b88ee";
#elif BUILDFLAG(IS_APPLE)
@@ -66,7 +66,7 @@
}
const char* FirstRemovedChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "251007e902e512d0359240ad957ee2dc";
#elif BUILDFLAG(IS_APPLE)
@@ -85,7 +85,7 @@
const wchar_t kLoadedFontText[] = L"I am testing my loaded font, WEE.";
const char* LoadedFontTextChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "b0efd562e84958f06bb006ba27d5f4bd";
#elif BUILDFLAG(IS_APPLE)
@@ -312,7 +312,7 @@
EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "a1bc9e4007dc2155e9f56bf16234573e";
#elif BUILDFLAG(IS_APPLE)
@@ -360,7 +360,7 @@
EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "a1bc9e4007dc2155e9f56bf16234573e";
#elif BUILDFLAG(IS_APPLE)
@@ -589,8 +589,9 @@
EXPECT_TRUE(FPDFPath_Close(blue_path));
FPDFPage_InsertObject(page, blue_path);
const char* last_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "ed14c60702b1489c597c7d46ece7f86d";
+ }
return "9823e1a21bd9b72b6a442ba4f12af946";
}();
{
@@ -790,7 +791,7 @@
ASSERT_EQ(2, FPDFPage_CountObjects(page));
const char* changed_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "e1c530ca0705424f19a1b7ff0bffdbaa";
#elif BUILDFLAG(IS_APPLE)
@@ -856,7 +857,7 @@
ASSERT_TRUE(page);
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "0822ec5d476e8371544ef4bb7a0596e1";
#elif BUILDFLAG(IS_APPLE)
@@ -930,7 +931,7 @@
ASSERT_TRUE(page);
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "6f22adb3ba2a2c60a940bfb52e14dd58";
#elif BUILDFLAG(IS_APPLE)
@@ -994,7 +995,7 @@
FPDF_PAGE page = LoadPage(0);
{
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "10c8257bb54b4431196d963d68d45f12";
#elif BUILDFLAG(IS_APPLE)
@@ -1017,7 +1018,7 @@
EXPECT_EQ(3, FPDFPage_CountObjects(page));
const char* removed_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "95484d03b9da898617f297b1429f7f84";
#elif BUILDFLAG(IS_APPLE)
@@ -1052,7 +1053,7 @@
// objects were upside down. Remove `wrong_checksum` after fixing this
// issue.
const char* wrong_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "441cada6218d4fd79dbe0ba95093524e";
#elif BUILDFLAG(IS_APPLE)
@@ -1429,7 +1430,7 @@
// Show what the original file looks like.
{
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "cefa45d13f92fb761251661a2c889157";
#elif BUILDFLAG(IS_APPLE)
@@ -1486,7 +1487,7 @@
EXPECT_EQ(11, FPDFPage_CountObjects(page));
const char* non_primes_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "690c7d4c7850fbe726c2299208425f4f";
#elif BUILDFLAG(IS_APPLE)
@@ -1506,7 +1507,7 @@
#endif // BUILDFLAG(IS_APPLE)
}();
const char* non_primes_after_save_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "690c7d4c7850fbe726c2299208425f4f";
#elif BUILDFLAG(IS_APPLE)
@@ -1799,7 +1800,7 @@
// Verify the "Hello, world!" text is gone.
ASSERT_EQ(2, FPDFPage_CountObjects(page));
const char* hello_removed_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "48b5524e20e942d2a8f7e15611968cc7";
#elif BUILDFLAG(IS_APPLE)
@@ -1966,7 +1967,7 @@
}
const char* stream1_removed_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "d7e6debf2dc02de449860ee8012a18d2";
#elif BUILDFLAG(IS_APPLE)
@@ -2342,8 +2343,9 @@
// Verify the black rectangle was added.
ASSERT_EQ(kOriginalObjectCount + 1, FPDFPage_CountObjects(page));
const char* plus_rectangle_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "0d3715fcfb9bd0dd25dcce60800bff47";
+ }
return "6b9396ab570754b32b04ca629e902f77";
}();
{
@@ -2491,7 +2493,7 @@
// Render and check the result.
ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "52c133b5b6bf76760c59cffc12c1131a";
#elif BUILDFLAG(IS_APPLE)
@@ -2529,8 +2531,9 @@
FPDFPage_InsertObject(page, red_rect);
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "1e82fbdd21490cee9d3479fe6125af67";
+ }
return "ad04e5bd0f471a9a564fb034bd0fb073";
}();
ScopedFPDFBitmap bitmap = RenderLoadedPage(page);
@@ -2559,8 +2562,9 @@
EXPECT_TRUE(FPDFPath_SetDrawMode(green_rect2, FPDF_FILLMODE_ALTERNATE, 0));
FPDFPage_InsertObject(saved_page, green_rect2);
const char* last_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "8705d023e5fec3499d1e30cf2bcc5dc1";
+ }
return "4b5b00f824620f8c9b8801ebb98e1cdd";
}();
{
@@ -2598,8 +2602,9 @@
{
ScopedFPDFBitmap page_bitmap = RenderPage(page);
const char* checksum_1 = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "1469acf60e7647ebeb8e1fb08c5d6c7a";
+ }
return "64bd31f862a89e0a9e505a5af6efd506";
}();
CompareBitmap(page_bitmap.get(), 612, 792, checksum_1);
@@ -2618,8 +2623,9 @@
{
ScopedFPDFBitmap page_bitmap = RenderPage(page);
const char* checksum_2 = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "68b3194f74abd9d471695ce1415be43f";
+ }
return "4b6f3b9d25c4e194821217d5016c3724";
}();
CompareBitmap(page_bitmap.get(), 612, 792, checksum_2);
@@ -2639,8 +2645,9 @@
{
ScopedFPDFBitmap page_bitmap = RenderPage(page);
const char* checksum_3 = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "ea784068651df2b9ba132ce9215e6780";
+ }
return "ff3e6a22326754944cc6e56609acd73b";
}();
CompareBitmap(page_bitmap.get(), 612, 792, checksum_3);
@@ -2684,7 +2691,7 @@
{
ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "667f74c7cbf72c75bce303ca2de975a3";
#elif BUILDFLAG(IS_APPLE)
@@ -2717,7 +2724,7 @@
{
ScopedFPDFBitmap page_bitmap = RenderPage(page.get());
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "4695b3de213d6795a591f27cd8d86e26";
#elif BUILDFLAG(IS_APPLE)
@@ -2806,7 +2813,7 @@
TEST_F(FPDFEditEmbedderTest, SetTextRenderMode) {
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "e17a6453cb48a600f180c5907c4ea02e";
#elif BUILDFLAG(IS_APPLE)
@@ -2822,8 +2829,9 @@
#endif
}();
const char* stroke_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "d16eb1bb4748eeb5fb801594da70d519";
+ }
return "e06ee84aeebe926e8c980b7822027e8a";
}();
@@ -3147,7 +3155,7 @@
TEST_F(FPDFEditEmbedderTest, ModifyFormObject) {
const char* orig_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "9d0ca0d471efc12950f337a867ab1694";
#elif BUILDFLAG(IS_APPLE)
@@ -3163,7 +3171,7 @@
#endif
}();
const char* new_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "dbebf244eb706dfebfd0594c23e993a9";
#elif BUILDFLAG(IS_APPLE)
@@ -3599,7 +3607,7 @@
}
ScopedFPDFBitmap page_bitmap2 = RenderPage(page);
const char* insert_true_type_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "7e44d135666d8bfcef5cdb4c8161fd4b";
#elif BUILDFLAG(IS_APPLE)
@@ -3685,7 +3693,7 @@
// Check that the text renders properly.
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "2e174d17de96a760d42ca3a06acbf36a";
}
return "84d31d11b76845423a2cfc1879c0fbb9";
@@ -3707,8 +3715,9 @@
TEST_F(FPDFEditEmbedderTest, SaveAndRender) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "9a78649e85e69d220c22e0fc316da740";
+ }
return "3c20472b0552c0c22b88ab1ed8c6202b";
}();
{
@@ -4378,8 +4387,9 @@
FPDFImageObj_GetRenderedBitmap(document(), page, obj));
EXPECT_EQ(FPDFBitmap_BGRA, FPDFBitmap_GetFormat(bitmap.get()));
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "3b51fc066ee18efbf70bab0501763603";
+ }
return "582ca300e003f512d7b552c7b5b45d2e";
}();
CompareBitmap(bitmap.get(), 53, 43, checksum);
@@ -4415,8 +4425,9 @@
FPDFImageObj_GetRenderedBitmap(document(), page, obj));
EXPECT_EQ(FPDFBitmap_BGRA, FPDFBitmap_GetFormat(bitmap.get()));
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "1003585870ad0fe37baf1c5bb3f5fd76";
+ }
return "0824c16dcf2dfcef44b45d88db1fddce";
}();
CompareBitmap(bitmap.get(), 120, 43, checksum);
@@ -4434,13 +4445,13 @@
ASSERT_EQ(kExpectedObjects, FPDFPage_CountObjects(page));
const char* smask_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "0653a18f3bf9b4d8413a2aa10bc11c38";
}
return "5a3ae4a660ce919e29c42ec2258142f1";
}();
const char* no_smask_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "0da49e63e7d6337aca78b19938e3bf65";
}
return "67504e83f5d78214ea00efc19082c5c1";
@@ -4773,7 +4784,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 1));
ASSERT_TRUE(bitmap);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "5cef5b3e56e91e1a66b6780fb26bb5e3";
#elif BUILDFLAG(IS_APPLE)
@@ -4790,7 +4801,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 2.4f));
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "3cea4255285df04659e3c7477287bdb1";
#elif BUILDFLAG(IS_APPLE)
@@ -4807,7 +4818,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 10));
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "1cc617da9ed5922eeac2414108509ef5";
#elif BUILDFLAG(IS_APPLE)
@@ -4829,7 +4840,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 1));
ASSERT_TRUE(bitmap);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "336be21110c795cefcab9bbdbc3afcdd";
#elif BUILDFLAG(IS_APPLE)
@@ -4846,7 +4857,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 2.4f));
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "c5cecc5553843a4dd4fff3ceb4855a82";
#elif BUILDFLAG(IS_APPLE)
@@ -4863,7 +4874,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 10));
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "cff29dcbe77092ec7f73e46766a289c7";
#elif BUILDFLAG(IS_APPLE)
@@ -4892,7 +4903,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 1));
ASSERT_TRUE(bitmap);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "ba5322a4e6b0f79dca42be88f3007708";
#elif BUILDFLAG(IS_APPLE)
@@ -4909,7 +4920,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 2.4f));
ASSERT_TRUE(x2_bitmap);
const char* x2_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "e8fb0a707b2924726757a2ed32d6f28d";
#elif BUILDFLAG(IS_APPLE)
@@ -4926,7 +4937,7 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 10));
ASSERT_TRUE(x10_bitmap);
const char* x10_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "eb0cbf56707d1c39ce0ab89a9b43d6a8";
#elif BUILDFLAG(IS_APPLE)
@@ -4954,8 +4965,9 @@
FPDFTextObj_GetRenderedBitmap(document(), page, text_object, 7.3f));
ASSERT_TRUE(bitmap);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "1d74731d23a056c0e3fb88f2f85b2581";
+ }
return "e8154fa8ededf4d9b8b35b5260897b6c";
}();
CompareBitmap(bitmap.get(), 120, 186, checksum);
@@ -4978,7 +4990,7 @@
FPDFTextObj_GetRenderedBitmap(document(), nullptr, text_object.get(), 1));
ASSERT_TRUE(bitmap);
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "ef501232372617a545ae35d7664fd9ec";
#elif BUILDFLAG(IS_APPLE)
@@ -5058,7 +5070,7 @@
EXPECT_TRUE(FPDFPage_GenerateContent(page));
}
- const char* checksum = CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()
+ const char* checksum = CFX_DefaultRenderDevice::UseSkiaRenderer()
? "7ebec75d95c64b522999a710de76c52c"
: "f4b36616a7fea81a4f06cc7b01a55ac1";
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index a5b8dad..8a6b1a2 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -317,8 +317,9 @@
return nullptr;
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
result_bitmap->UnPreMultiply();
+ }
#endif
// Caller takes ownership.
diff --git a/fpdfsdk/fpdf_editpage_embeddertest.cpp b/fpdfsdk/fpdf_editpage_embeddertest.cpp
index e6eba89..b8453cc 100644
--- a/fpdfsdk/fpdf_editpage_embeddertest.cpp
+++ b/fpdfsdk/fpdf_editpage_embeddertest.cpp
@@ -12,8 +12,9 @@
TEST_F(FPDFEditPageEmbedderTest, Rotation) {
const char* rotated_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "eded83f75f3d0332c584c416c571c0df";
+ }
return "d599429574ff0dcad3bc898ea8b874ca";
}();
diff --git a/fpdfsdk/fpdf_flatten_embeddertest.cpp b/fpdfsdk/fpdf_flatten_embeddertest.cpp
index 2a29d7e..df8b88b 100644
--- a/fpdfsdk/fpdf_flatten_embeddertest.cpp
+++ b/fpdfsdk/fpdf_flatten_embeddertest.cpp
@@ -41,7 +41,7 @@
TEST_F(FPDFFlattenEmbedderTest, BUG_861842) {
const char* checkbox_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_APPLE)
return "84a527f16649880525a1a8edc6c24c16";
#else
@@ -74,7 +74,7 @@
TEST_F(FPDFFlattenEmbedderTest, BUG_889099) {
const char* page_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "1d83328d2d1ca12b9c9ea5faa62ac515";
#elif BUILDFLAG(IS_APPLE)
@@ -90,7 +90,7 @@
#endif
}();
const char* flattened_page_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "07deccbd4a42aaf6bf45a525f0be388e";
#elif BUILDFLAG(IS_APPLE)
@@ -124,8 +124,9 @@
TEST_F(FPDFFlattenEmbedderTest, BUG_890322) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "793689536cf64fe792c2f241888c0cf3";
+ }
return "6c674642154408e877d88c6c082d67e9";
}();
ASSERT_TRUE(OpenDocument("bug_890322.pdf"));
@@ -145,8 +146,9 @@
TEST_F(FPDFFlattenEmbedderTest, BUG_896366) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "c3cccfadc4c5249e6aa0675e511fa4c3";
+ }
return "f71ab085c52c8445ae785eca3ec858b1";
}();
ASSERT_TRUE(OpenDocument("bug_896366.pdf"));
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index ee72562..4631338 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -201,7 +201,7 @@
auto pDevice = std::make_unique<CFX_DefaultRenderDevice>();
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer() && canvas) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer() && canvas) {
pDevice->AttachCanvas(reinterpret_cast<SkCanvas*>(canvas));
}
#endif
diff --git a/fpdfsdk/fpdf_formfill_embeddertest.cpp b/fpdfsdk/fpdf_formfill_embeddertest.cpp
index dd79566..2842ec3 100644
--- a/fpdfsdk/fpdf_formfill_embeddertest.cpp
+++ b/fpdfsdk/fpdf_formfill_embeddertest.cpp
@@ -1336,7 +1336,7 @@
TEST_F(FPDFFormFillEmbedderTest, FormText) {
const char* focused_text_form_with_abc_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "8b743c7a6186360862ca6f6db8f55c8f";
#elif BUILDFLAG(IS_APPLE)
@@ -1352,7 +1352,7 @@
#endif
}();
const char* unfocused_text_form_with_abc_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "37328bf7614d6fc05b03893ee030aec4";
#elif BUILDFLAG(IS_APPLE)
@@ -1418,8 +1418,9 @@
// bitmaps should be different.
TEST_F(FPDFFormFillEmbedderTest, BUG_1281) {
const char* reverse_byte_order_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "8077970bbd10333f18186a9bb459bbe6";
+ }
return "24fff03d1e663b7ece5f6e69ad837124";
}();
@@ -1440,8 +1441,9 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455RenderOnly) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "520c4415c9977f40d6b4af5a0a94d764";
+ }
return "bbee92af1daec2340c81f482878744d8";
}();
{
@@ -1461,7 +1463,7 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditFirstForm) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "2e5d64e4280ca954eb528e82f92abb75";
#elif BUILDFLAG(IS_APPLE)
@@ -1501,7 +1503,7 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditSecondForm) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "8408fc1796bf17d48b947ed0e4d65ef2";
#elif BUILDFLAG(IS_APPLE)
@@ -1541,7 +1543,7 @@
TEST_F(FPDFFormFillEmbedderTest, Bug1302455EditBothForms) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "1c2b618f68d1ad2cfa01fcf38efc4831";
#elif BUILDFLAG(IS_APPLE)
@@ -1588,7 +1590,7 @@
TEST_F(FPDFFormFillEmbedderTest, RemoveFormFieldHighlight) {
const char* no_highlight_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "2235e2ba8349552de0c818ae53257949";
#elif BUILDFLAG(IS_APPLE)
diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 8398459..7ad2308 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -41,7 +41,7 @@
constexpr int kRectanglesMultiPagesPageCount = 2;
const char* RectanglesMultiPagesExpectedChecksum(int page_index) {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
static constexpr const char* kChecksums[kRectanglesMultiPagesPageCount] = {
"07606a12487bd0c28a88f23fa00fc313", "94ea6e1eef220833a3ec14d6a1c612b0"};
return kChecksums[page_index];
@@ -53,7 +53,7 @@
const char* Bug750568PageHash(int page_index) {
constexpr int kBug750568PageCount = 4;
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
static constexpr const char* kChecksums[kBug750568PageCount] = {
"eaa139e944eafb43d31e8742a0e158de", "226485e9d4fa6a67dfe0a88723f12060",
"c5601a3492ae5dcc5dd25140fc463bfe", "1f60055b54de4fac8a59c65e90da156e"};
@@ -176,8 +176,9 @@
TEST_F(FPDFPPOEmbedderTest, ImportPageToXObject) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "d6ebc0a8afc22fe0137f54ce54e1a19c";
+ }
return "2d88d180af7109eb346439f7c855bb29";
}();
@@ -276,8 +277,9 @@
TEST_F(FPDFPPOEmbedderTest, ImportPageToXObjectWithSameDoc) {
const char* checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "8e7d672f49f9ca98fb9157824cefc204";
+ }
return "4d5ca14827b7707f8283e639b33c121a";
}();
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index 83b5797..3f91714 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -71,7 +71,7 @@
/*need_to_restore=*/false, &pause_adapter);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
#endif // defined(_SKIA_SUPPORT_)
@@ -115,7 +115,7 @@
pContext->m_pRenderer->Continue(&pause_adapter);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pContext->m_pDevice->GetBitmap()->UnPreMultiply();
}
#endif // defined(_SKIA_SUPPORT_)
diff --git a/fpdfsdk/fpdf_transformpage_embeddertest.cpp b/fpdfsdk/fpdf_transformpage_embeddertest.cpp
index 8072262..e66b033 100644
--- a/fpdfsdk/fpdf_transformpage_embeddertest.cpp
+++ b/fpdfsdk/fpdf_transformpage_embeddertest.cpp
@@ -18,8 +18,9 @@
namespace {
const char* ShrunkChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "78c52d6029283090036e6db6683401e2";
+ }
return "f4136cc9209207ab60eb8381a3df2e69";
}
@@ -210,8 +211,9 @@
TEST_F(FPDFTransformEmbedderTest, SetCropBox) {
const char* cropped_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "4b9d2d2246be61c583f454245fe3172f";
+ }
return "9937883715d5144c079fb8f7e3d4f395";
}();
{
@@ -286,8 +288,9 @@
TEST_F(FPDFTransformEmbedderTest, SetMediaBox) {
const char* shrunk_checksum_set_media_box = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "9f28f0610a7f789c24cfd5f9bd5dc3de";
+ }
return "eab5958f62f7ce65d7c32de98389fee1";
}();
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 4655fe5..107653e 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -129,7 +129,7 @@
// This build configuration has the option for runtime renderer selection.
if (public_type == FPDF_RENDERERTYPE_AGG ||
public_type == FPDF_RENDERERTYPE_SKIA) {
- CFX_DefaultRenderDevice::SetDefaultRenderer(
+ CFX_DefaultRenderDevice::SetRendererType(
static_cast<CFX_DefaultRenderDevice::RendererType>(public_type));
return;
}
@@ -587,7 +587,7 @@
// Create will probably work fine even if it fails here: we will just attach
// a zero-sized bitmap to `device`.
pBitmap->Create(size_x, size_y, FXDIB_Format::kArgb);
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Not needed by Skia. Call it for AGG to preserve pre-existing behavior.
pBitmap->Clear(0x00ffffff);
}
@@ -606,7 +606,7 @@
/*pause=*/nullptr);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
#endif
@@ -700,7 +700,7 @@
/*pause=*/nullptr);
#if defined(_SKIA_SUPPORT_)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
#endif
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 67d4ef7..08cc387 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -992,58 +992,69 @@
TEST_F(FPDFViewEmbedderTest, FPDF_RenderPageBitmapWithMatrix) {
const char* clipped_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "d2929fae285593cd1c1d446750d47d60";
+ }
return "a84cab93c102b9b9290fba3047ba702c";
}();
const char* top_left_quarter_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "31d24d8c6a2bac380b2f5c393e77ecc9";
+ }
return "f11a11137c8834389e31cf555a4a6979";
}();
const char* hori_stretched_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "6d3776d7bb21cbb7195126b8e95dfba2";
+ }
return "48ef9205941ed19691ccfa00d717187e";
}();
const char* rotated_90_clockwise_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "b4baa001d201baed576cd6d5d0d5a160";
+ }
return "d8da2c7bf77521550d0f2752b9cf3482";
}();
const char* rotated_180_clockwise_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "51819227d0863222aed366d5d7c5d9c8";
+ }
return "0113386bb0bd45125bacc6dee78bfe78";
}();
const char* rotated_270_clockwise_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "f2b046e46c2751cebc777a9725ae2f3e";
+ }
return "a287e0f74ce203699cda89f9cc97a240";
}();
const char* mirror_hori_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "c7fbec322b4fc6bcf46ec1eb89661c41";
+ }
return "6e8d7a6fde39d8e720fb9e620102918c";
}();
const char* mirror_vert_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "a8b00bc40677a73c15a08b9769d1b576";
+ }
return "8f3a555ef9c0d5031831ae3715273707";
}();
const char* larger_top_left_quarter_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "35deb5ed4b73675ce33f68328a33c687";
+ }
return "172a2f4adafbadbe98017b1c025b9e27";
}();
const char* larger_rotated_diagonal_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "85c41bb892c1a09882f432aa2f4a5ef6";
+ }
return "3d62417468bdaff0eb14391a0c30a3b1";
}();
const char* tile_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "387be3a84774f39aaa955314d2fe7106";
+ }
return "0a190003c97220bf8877684c8d7e89cf";
}();
const char kLargerChecksum[] = "c806145641c3e6fc4e022c7065343749";
@@ -1455,7 +1466,7 @@
// macOS rendering result doesn't.
const char* original_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "1c5d8217aca4f6fa86a8ed192f34b210";
#elif BUILDFLAG(IS_APPLE)
@@ -1485,7 +1496,7 @@
TEST_F(FPDFViewEmbedderTest, RenderAnnotationWithPrintingFlag) {
const char* annotation_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "eaece6b8041c0cb9b33398e5b6d5ddda";
}
return "c108ba6e0a9743652f12e4bc223f9b32";
@@ -1549,13 +1560,15 @@
TEST_F(FPDFViewEmbedderTest, RenderManyRectanglesWithFlags) {
const char* grayscale_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "b596ac8bbe64e7bff31888ab05e4dcf4";
+ }
return "7b553f1052069a9c61237a05db0955d6";
}();
const char* no_smoothpath_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "4d71ed53d9f6e6a761876ebb4ff23e19";
+ }
return "ff6e5c509d1f6984bcdfd18b26a4203a";
}();
@@ -1590,8 +1603,9 @@
ASSERT_TRUE(page);
const char* bgr_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "4d52e5cc1d4a8067bf918b85b232fff0";
+ }
return "ab6312e04c0d3f4e46fb302a45173d05";
}();
static constexpr int kBgrStride = 600; // Width of 200 * 24 bits per pixel.
@@ -1603,8 +1617,9 @@
bgr_checksum);
const char* gray_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "3dfe1fc3889123d68e1748fefac65e72";
+ }
return "b561c11edc44dc3972125a9b8744fa2f";
}();
@@ -1658,7 +1673,7 @@
HelloWorldChecksum());
const char* lcd_text_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "496d1f907349b153c5ecdc87c8073c7b";
#elif BUILDFLAG(IS_APPLE)
@@ -1674,7 +1689,7 @@
#endif // BUILDFLAG(IS_APPLE)
}();
const char* no_smoothtext_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "04dcf7d221437081034ca1152c717a8a";
#elif BUILDFLAG(IS_APPLE)
@@ -2045,7 +2060,7 @@
#if defined(_SKIA_SUPPORT_)
TEST_F(FPDFViewEmbedderTest, RenderPageToSkp) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
GTEST_SKIP() << "FPDF_RenderPageSkp() only makes sense with Skia";
}
@@ -2060,7 +2075,7 @@
}
TEST_F(FPDFViewEmbedderTest, RenderXfaPageToSkp) {
- if (!CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
GTEST_SKIP() << "FPDF_RenderPageSkp() only makes sense with Skia";
}
@@ -2083,11 +2098,11 @@
const char* checksum = []() {
#if BUILDFLAG(IS_WIN)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "d97d0a9da6a5955f68a58a3f25466bd7";
}
#elif !BUILDFLAG(IS_APPLE)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "ceeb93d2bcdb586d62c95b33cadcd873";
}
#endif
diff --git a/testing/embedder_test_constants.cpp b/testing/embedder_test_constants.cpp
index b7c8571..0aced5a 100644
--- a/testing/embedder_test_constants.cpp
+++ b/testing/embedder_test_constants.cpp
@@ -10,7 +10,7 @@
namespace pdfium {
const char* AnnotationStampWithApChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "f7f3a1029cea01cc993fa7770feebdc1";
#elif BUILDFLAG(IS_APPLE)
@@ -29,13 +29,14 @@
const char kBlankPage612By792Checksum[] = "1940568c9ba33bac5d0b1ee9558c76b3";
const char* Bug890322Checksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "793689536cf64fe792c2f241888c0cf3";
+ }
return "6c674642154408e877d88c6c082d67e9";
}
const char* HelloWorldChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "6023c7d8b7258cc686a1d1dbd0f4d6d0";
#elif BUILDFLAG(IS_APPLE)
@@ -52,7 +53,7 @@
}
const char* HelloWorldRemovedChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "7db00f520f0838da10ef45373af3f6aa";
#elif BUILDFLAG(IS_APPLE)
@@ -69,19 +70,21 @@
}
const char* ManyRectanglesChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "4e7e280c1597222afcb0ee3bb90ec119";
+ }
return "b0170c575b65ecb93ebafada0ff0f038";
}
const char* RectanglesChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "b4e411a6b5ffa59a50efede2efece597";
+ }
return "0a90de37f52127619c3dfb642b5fa2fe";
}
const char* TextFormChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
#if BUILDFLAG(IS_WIN)
return "e83f49ddea0822734a16b986e9935732";
#elif BUILDFLAG(IS_APPLE)
diff --git a/xfa/fde/cfde_textout_unittest.cpp b/xfa/fde/cfde_textout_unittest.cpp
index 77e2949..6971f03 100644
--- a/xfa/fde/cfde_textout_unittest.cpp
+++ b/xfa/fde/cfde_textout_unittest.cpp
@@ -88,7 +88,7 @@
text_out().DrawLogicText(device(), L"foo", CFX_RectF(0, 0, 2100, 100));
const char* checksum = []() {
#if BUILDFLAG(IS_WIN)
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "cdd8f00144e421bf18f22d09896838b0";
}
#endif
@@ -125,7 +125,7 @@
}
const char* GetLargeTextBlobChecksum() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer()) {
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "cd357c6afbf17bb2ac48817df5d9eaad";
}
return "268b71a8660b51e31c6bf30fc7ff1e08";
diff --git a/xfa/fwl/cfwl_edit_embeddertest.cpp b/xfa/fwl/cfwl_edit_embeddertest.cpp
index 6904b8d..7496a24 100644
--- a/xfa/fwl/cfwl_edit_embeddertest.cpp
+++ b/xfa/fwl/cfwl_edit_embeddertest.cpp
@@ -85,8 +85,9 @@
TEST_F(CFWLEditEmbedderTest, DragMouseSelection) {
// TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
@@ -115,8 +116,9 @@
TEST_F(CFWLEditEmbedderTest, SimpleFill) {
// TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
const char kBlankMD5[] = "8dda78a3afaf9f7b5210eb81cacc4600";
@@ -139,8 +141,9 @@
TEST_F(CFWLEditEmbedderTest, FillWithNewLineWithoutMultiline) {
// TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
CreateAndInitializeFormPDF("xfa/email_recommended.pdf");
FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
@@ -210,8 +213,9 @@
TEST_F(CFWLEditEmbedderTest, DateTimePickerTest) {
// TODO(crbug.com/pdfium/11): Fix this test and enable for Skia variants.
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return;
+ }
CreateAndInitializeFormPDF("xfa/xfa_date_time_edit.pdf");
@@ -254,8 +258,9 @@
CreateAndInitializeFormPDF("xfa/xfa_image_edit.pdf");
FORM_OnLButtonDown(form_handle(), page(), 0, 115, 58);
const char* filled_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "23658ed124114f05518372d41c80e41b";
+ }
return "101cf6223fa2403fba4c413a8310ab02";
}();
ScopedFPDFBitmap page_bitmap = RenderLoadedPageWithFlags(page(), FPDF_ANNOT);
@@ -270,8 +275,9 @@
FORM_OnLButtonUp(form_handle(), page(), 0, 115, 58);
{
const char* filled_checksum = []() {
- if (CFX_DefaultRenderDevice::SkiaIsDefaultRenderer())
+ if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
return "8c555487e09ee4acf3ace77db5929bdc";
+ }
return "dad642ae8a5afce2591ffbcabbfc58dd";
}();
ScopedFPDFBitmap page_bitmap =
