Rename _SKIA_SUPPORT_ to PDF_USE_SKIA
Be consistent with other defines in the code base. Avoid using a leading
underscore, as that is considered reserved by C/C++.
Bug: pdfium:11
Change-Id: I2e75b70236944f5c09cad3c9a1f6ed13761d8189
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114833
Auto-Submit: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index 4586cc5..0695615 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -41,7 +41,7 @@
}
if (pdf_use_skia) {
- defines += [ "_SKIA_SUPPORT_" ]
+ defines += [ "PDF_USE_SKIA" ]
}
if (pdf_use_partition_alloc) {
diff --git a/core/fpdfapi/page/cpdf_expintfunc.h b/core/fpdfapi/page/cpdf_expintfunc.h
index 22e7f12..1c501d8 100644
--- a/core/fpdfapi/page/cpdf_expintfunc.h
+++ b/core/fpdfapi/page/cpdf_expintfunc.h
@@ -10,7 +10,7 @@
#include "core/fpdfapi/page/cpdf_function.h"
#include "core/fxcrt/data_vector.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "third_party/base/containers/span.h"
#endif
@@ -27,7 +27,7 @@
uint32_t GetOrigOutputs() const { return m_nOrigOutputs; }
float GetExponent() const { return m_Exponent; }
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
pdfium::span<const float> GetBeginValues() const { return m_BeginValues; }
pdfium::span<const float> GetEndValues() const { return m_EndValues; }
#endif
diff --git a/core/fpdfapi/page/cpdf_function.cpp b/core/fpdfapi/page/cpdf_function.cpp
index 5e885e1..2cd2bc1 100644
--- a/core/fpdfapi/page/cpdf_function.cpp
+++ b/core/fpdfapi/page/cpdf_function.cpp
@@ -170,7 +170,7 @@
return ymin + (divisor ? (x - xmin) * (ymax - ymin) / divisor : 0);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
const CPDF_SampledFunc* CPDF_Function::ToSampledFunc() const {
return m_Type == Type::kType0Sampled
? static_cast<const CPDF_SampledFunc*>(this)
@@ -188,4 +188,4 @@
? static_cast<const CPDF_StitchFunc*>(this)
: nullptr;
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
diff --git a/core/fpdfapi/page/cpdf_function.h b/core/fpdfapi/page/cpdf_function.h
index d943e60..2039e61 100644
--- a/core/fpdfapi/page/cpdf_function.h
+++ b/core/fpdfapi/page/cpdf_function.h
@@ -48,11 +48,11 @@
float ymin,
float ymax) const;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
const CPDF_SampledFunc* ToSampledFunc() const;
const CPDF_ExpIntFunc* ToExpIntFunc() const;
const CPDF_StitchFunc* ToStitchFunc() const;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
protected:
explicit CPDF_Function(Type type);
diff --git a/core/fpdfapi/page/cpdf_pageimagecache.cpp b/core/fpdfapi/page/cpdf_pageimagecache.cpp
index 2518b08..1845d6f 100644
--- a/core/fpdfapi/page/cpdf_pageimagecache.cpp
+++ b/core/fpdfapi/page/cpdf_pageimagecache.cpp
@@ -25,7 +25,7 @@
#include "core/fxge/dib/cfx_dibitmap.h"
#include "third_party/base/check.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "core/fxcrt/data_vector.h"
#include "core/fxge/cfx_defaultrenderdevice.h"
#include "third_party/skia/include/core/SkImage.h" // nogncheck
@@ -44,7 +44,7 @@
bool operator<(const CacheInfo& other) const { return time < other.time; }
};
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// Wrapper around a `CFX_DIBBase` that memoizes `RealizeSkImage()`. This is only
// safe if the underlying `CFX_DIBBase` is not mutable.
class CachedImage final : public CFX_DIBBase {
@@ -77,7 +77,7 @@
return image_->GetEstimatedImageMemoryBurden();
}
-#if BUILDFLAG(IS_WIN) || defined(_SKIA_SUPPORT_)
+#if BUILDFLAG(IS_WIN) || defined(PDF_USE_SKIA)
RetainPtr<const CFX_DIBitmap> RealizeIfNeeded() const override {
return image_->RealizeIfNeeded();
}
@@ -94,19 +94,19 @@
RetainPtr<CFX_DIBBase> image_;
mutable sk_sp<SkImage> cached_skia_image_;
};
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
// Makes a `CachedImage` backed by `image` if Skia is the default renderer,
// otherwise return the image itself. `realize_hint` indicates whether it would
// be beneficial to realize `image` before caching.
RetainPtr<CFX_DIBBase> MakeCachedImage(RetainPtr<CFX_DIBBase> image,
bool realize_hint) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Ignore `realize_hint`, as `RealizeSkImage()` doesn't benefit from it.
return pdfium::MakeRetain<CachedImage>(std::move(image));
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
return realize_hint ? image->Realize() : image;
}
diff --git a/core/fpdfapi/page/cpdf_sampledfunc.cpp b/core/fpdfapi/page/cpdf_sampledfunc.cpp
index 6ccc874..6e9682b 100644
--- a/core/fpdfapi/page/cpdf_sampledfunc.cpp
+++ b/core/fpdfapi/page/cpdf_sampledfunc.cpp
@@ -179,7 +179,7 @@
return true;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
RetainPtr<CPDF_StreamAcc> CPDF_SampledFunc::GetSampleStream() const {
return m_pSampleStream;
}
diff --git a/core/fpdfapi/page/cpdf_sampledfunc.h b/core/fpdfapi/page/cpdf_sampledfunc.h
index 93c81df..d658083 100644
--- a/core/fpdfapi/page/cpdf_sampledfunc.h
+++ b/core/fpdfapi/page/cpdf_sampledfunc.h
@@ -40,7 +40,7 @@
}
uint32_t GetBitsPerSample() const { return m_nBitsPerSample; }
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
RetainPtr<CPDF_StreamAcc> GetSampleStream() const;
#endif
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index 07d50ed..7f3eddc 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -53,7 +53,7 @@
}
void ClearBitmap(CFX_DefaultRenderDevice& bitmap_device, uint32_t color) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
bitmap_device.Clear(color);
return;
@@ -365,7 +365,7 @@
new_matrix, rect);
DCHECK(!bitmap_device2.GetBitmap()->HasPalette());
bitmap_device2.GetBitmap()->ConvertFormat(FXDIB_Format::k8bppMask);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer() &&
m_pRenderStatus->GetRenderDevice()->SetBitsWithMask(
bitmap_device1.GetBitmap(), bitmap_device2.GetBitmap(), rect.left,
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 590692d..4882586 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -667,7 +667,7 @@
bitmap_render.SetFormResource(std::move(pFormResource));
bitmap_render.Initialize(nullptr, nullptr);
bitmap_render.ProcessObjectNoClip(pPageObj, new_matrix);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Safe because `CFX_SkiaDeviceDriver` always uses pre-multiplied alpha.
// TODO(crbug.com/pdfium/2011): Remove the need for this.
@@ -694,7 +694,7 @@
if (pPageObj->IsForm()) {
transparency.SetGroup();
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
bitmap_device.GetBitmap()->UnPreMultiply();
}
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h
index 9877f6a..fbf6d0b 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.h
+++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -94,7 +94,7 @@
CFX_RenderDevice* GetRenderDevice() const { return m_pDevice; }
const CPDF_RenderOptions& GetRenderOptions() const { return m_Options; }
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
void DebugVerifyDeviceIsPreMultiplied() const;
#endif
diff --git a/core/fpdfapi/render/cpdf_rendertiling.cpp b/core/fpdfapi/render/cpdf_rendertiling.cpp
index 47a7c42..a997368 100644
--- a/core/fpdfapi/render/cpdf_rendertiling.cpp
+++ b/core/fpdfapi/render/cpdf_rendertiling.cpp
@@ -59,11 +59,11 @@
context.AppendLayer(pPatternForm, mtPattern2Bitmap);
context.Render(&bitmap_device, nullptr, &options, nullptr);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
return pBitmap;
}
diff --git a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
index 2f2f953..187797c 100644
--- a/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
+++ b/core/fpdfapi/render/cpdf_scaledrenderbuffer.cpp
@@ -69,7 +69,7 @@
void CPDF_ScaledRenderBuffer::OutputToDevice() {
if (m_pBitmapDevice) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (!m_pBitmapDevice->SyncInternalBitmaps()) {
return;
}
diff --git a/core/fxcodec/jbig2/jbig2_embeddertest.cpp b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
index 1b656fd..cb469b9 100644
--- a/core/fxcodec/jbig2/jbig2_embeddertest.cpp
+++ b/core/fxcodec/jbig2/jbig2_embeddertest.cpp
@@ -8,7 +8,7 @@
class JBig2EmbedderTest : public EmbedderTest {};
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// TODO(crbug.com/pdfium/11): Fix this test and enable.
#define MAYBE_Bug_631912 DISABLED_Bug_631912
#else
diff --git a/core/fxge/cfx_defaultrenderdevice.cpp b/core/fxge/cfx_defaultrenderdevice.cpp
index 4da848a..75f5a6d 100644
--- a/core/fxge/cfx_defaultrenderdevice.cpp
+++ b/core/fxge/cfx_defaultrenderdevice.cpp
@@ -12,7 +12,7 @@
// When build variant is Skia then it is assumed as the default, but might be
// overridden at runtime.
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_DefaultRenderDevice::RendererType g_renderer_type =
CFX_DefaultRenderDevice::kDefaultRenderer;
#endif
@@ -21,14 +21,14 @@
// static
bool CFX_DefaultRenderDevice::UseSkiaRenderer() {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
return g_renderer_type == RendererType::kSkia;
#else
return false;
#endif
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// static
void CFX_DefaultRenderDevice::SetRendererType(RendererType renderer_type) {
g_renderer_type = renderer_type;
@@ -62,7 +62,7 @@
bool bRgbByteOrder,
RetainPtr<CFX_DIBitmap> pBackdropBitmap,
bool bGroupKnockout) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (UseSkiaRenderer()) {
return AttachSkiaImpl(std::move(pBitmap), bRgbByteOrder,
std::move(pBackdropBitmap), bGroupKnockout);
@@ -76,7 +76,7 @@
int height,
FXDIB_Format format,
RetainPtr<CFX_DIBitmap> pBackdropBitmap) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (UseSkiaRenderer()) {
return CreateSkia(width, height, format, pBackdropBitmap);
}
diff --git a/core/fxge/cfx_defaultrenderdevice.h b/core/fxge/cfx_defaultrenderdevice.h
index b9ca8f0..7a0ab17 100644
--- a/core/fxge/cfx_defaultrenderdevice.h
+++ b/core/fxge/cfx_defaultrenderdevice.h
@@ -32,7 +32,7 @@
FXDIB_Format format,
RetainPtr<CFX_DIBitmap> pBackdropBitmap);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool AttachCanvas(SkCanvas* canvas);
void Clear(uint32_t color);
#endif
@@ -40,7 +40,7 @@
// Runtime check to see if Skia is the renderer variant in use.
static bool UseSkiaRenderer();
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// This internal definition of renderer types must stay updated with respect
// to the public definition of `FPDF_RENDERER_TYPE`, so that all public
// definition values can be mapped to a value in
@@ -55,7 +55,7 @@
static constexpr RendererType kDefaultRenderer = RendererType::kSkia;
static void SetRendererType(RendererType renderer_type);
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
private:
bool AttachImpl(RetainPtr<CFX_DIBitmap> pBitmap,
@@ -73,7 +73,7 @@
FXDIB_Format format,
RetainPtr<CFX_DIBitmap> pBackdropBitmap);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool AttachSkiaImpl(RetainPtr<CFX_DIBitmap> pBitmap,
bool bRgbByteOrder,
RetainPtr<CFX_DIBitmap> pBackdropBitmap,
diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
index 39a6445..b5b7511 100644
--- a/core/fxge/cfx_font.cpp
+++ b/core/fxge/cfx_font.cpp
@@ -522,7 +522,7 @@
return m_Face && m_Face->IsFixedWidth();
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool CFX_Font::IsSubstFontBold() const {
CFX_SubstFont* subst_font = GetSubstFont();
return subst_font && subst_font->GetOriginalWeight() >= FXFONT_FW_BOLD;
@@ -758,7 +758,7 @@
return kAngleSkew[-angle];
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_TypeFace* CFX_Font::GetDeviceCache() const {
return GetOrCreateGlyphCache()->GetDeviceCache(this);
}
diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h
index d1cc83d..09041e1 100644
--- a/core/fxge/cfx_font.h
+++ b/core/fxge/cfx_font.h
@@ -23,7 +23,7 @@
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/base/containers/span.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "core/fxge/fx_font.h"
#endif
@@ -137,7 +137,7 @@
int dest_width) const;
int GetGlyphWidthImpl(uint32_t glyph_index, int dest_width, int weight) const;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_TypeFace* GetDeviceCache() const;
bool IsSubstFontBold() const;
#endif
diff --git a/core/fxge/cfx_fontcache.cpp b/core/fxge/cfx_fontcache.cpp
index 5ce96c9..8079910 100644
--- a/core/fxge/cfx_fontcache.cpp
+++ b/core/fxge/cfx_fontcache.cpp
@@ -28,7 +28,7 @@
return new_cache;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_TypeFace* CFX_FontCache::GetDeviceCache(const CFX_Font* pFont) {
return GetGlyphCache(pFont)->GetDeviceCache(pFont);
}
diff --git a/core/fxge/cfx_fontcache.h b/core/fxge/cfx_fontcache.h
index 9b7a426..fc0351e 100644
--- a/core/fxge/cfx_fontcache.h
+++ b/core/fxge/cfx_fontcache.h
@@ -22,7 +22,7 @@
~CFX_FontCache();
RetainPtr<CFX_GlyphCache> GetGlyphCache(const CFX_Font* pFont);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont);
#endif
diff --git a/core/fxge/cfx_glyphcache.cpp b/core/fxge/cfx_glyphcache.cpp
index 2ed7597..076ddbb 100644
--- a/core/fxge/cfx_glyphcache.cpp
+++ b/core/fxge/cfx_glyphcache.cpp
@@ -28,7 +28,7 @@
#include "core/fxge/scoped_font_transform.h"
#include "third_party/base/numerics/safe_math.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "third_party/skia/include/core/SkStream.h" // nogncheck
#include "third_party/skia/include/core/SkTypeface.h" // nogncheck
#include "third_party/skia/include/core/SkFontMgr.h" // nogncheck
@@ -340,7 +340,7 @@
return m_WidthMap[key];
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
namespace {
// A singleton SkFontMgr which can be used to decode raw font data or
@@ -385,7 +385,7 @@
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE)
return m_pTypeface.get();
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
CFX_GlyphBitmap* CFX_GlyphCache::LookUpGlyphBitmap(
const CFX_Font* pFont,
diff --git a/core/fxge/cfx_glyphcache.h b/core/fxge/cfx_glyphcache.h
index 6297809..895d062 100644
--- a/core/fxge/cfx_glyphcache.h
+++ b/core/fxge/cfx_glyphcache.h
@@ -16,7 +16,7 @@
#include "core/fxcrt/retain_ptr.h"
#include "core/fxge/cfx_face.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "core/fxge/fx_font.h"
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
@@ -49,7 +49,7 @@
RetainPtr<CFX_Face> GetFace() { return m_Face; }
FXFT_FaceRec* GetFaceRec() { return m_Face ? m_Face->GetRec() : nullptr; }
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_TypeFace* GetDeviceCache(const CFX_Font* pFont);
static void InitializeGlobals();
static void DestroyGlobals();
@@ -88,7 +88,7 @@
std::map<ByteString, SizeGlyphCache> m_SizeMap;
std::map<PathMapKey, std::unique_ptr<CFX_Path>> m_PathMap;
std::map<WidthMapKey, int> m_WidthMap;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
sk_sp<SkTypeface> m_pTypeface;
#endif
};
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index ca2b08b..4009e98 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -35,7 +35,7 @@
#include "third_party/base/check_op.h"
#include "third_party/base/containers/span.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "third_party/skia/include/core/SkTypes.h" // nogncheck
#endif
@@ -712,7 +712,7 @@
if (fill && fill_alpha && stroke_alpha < 0xff && fill_options.stroke) {
if (m_RenderCaps & FXRC_FILLSTROKE_PATH) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
m_pDeviceDriver->SetGroupKnockout(true);
}
@@ -721,7 +721,7 @@
path, pObject2Device, pGraphState, fill_color, stroke_color,
fill_options, blend_type);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// Restore the group knockout status for `m_pDeviceDriver` after
// finishing painting a fill-and-stroke path.
@@ -994,7 +994,7 @@
return m_pDeviceDriver->ContinueDIBits(handle, pPause);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool CFX_RenderDevice::SetBitsWithMask(const RetainPtr<CFX_DIBBase>& pBitmap,
const RetainPtr<CFX_DIBBase>& pMask,
int left,
diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h
index 8b45ef8..81d8d2b 100644
--- a/core/fxge/cfx_renderdevice.h
+++ b/core/fxge/cfx_renderdevice.h
@@ -214,7 +214,7 @@
// Multiplies the device by an alpha mask, returning `true` on success.
bool MultiplyAlpha(const RetainPtr<CFX_DIBBase>& mask);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool SetBitsWithMask(const RetainPtr<CFX_DIBBase>& pBitmap,
const RetainPtr<CFX_DIBBase>& pMask,
int left,
diff --git a/core/fxge/cfx_substfont.cpp b/core/fxge/cfx_substfont.cpp
index 9fb243f..6f669d7 100644
--- a/core/fxge/cfx_substfont.cpp
+++ b/core/fxge/cfx_substfont.cpp
@@ -10,7 +10,7 @@
CFX_SubstFont::~CFX_SubstFont() = default;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
int CFX_SubstFont::GetOriginalWeight() const {
int weight = m_Weight;
diff --git a/core/fxge/cfx_substfont.h b/core/fxge/cfx_substfont.h
index c989e37..5827ef1 100644
--- a/core/fxge/cfx_substfont.h
+++ b/core/fxge/cfx_substfont.h
@@ -15,7 +15,7 @@
CFX_SubstFont();
~CFX_SubstFont();
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
int GetOriginalWeight() const;
#endif
void UseChromeSerif();
diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp
index 5186248..ef4f970 100644
--- a/core/fxge/dib/cfx_dibbase.cpp
+++ b/core/fxge/dib/cfx_dibbase.cpp
@@ -625,7 +625,7 @@
return GetRequiredPaletteSize() * sizeof(uint32_t);
}
-#if BUILDFLAG(IS_WIN) || defined(_SKIA_SUPPORT_)
+#if BUILDFLAG(IS_WIN) || defined(PDF_USE_SKIA)
RetainPtr<const CFX_DIBitmap> CFX_DIBBase::RealizeIfNeeded() const {
return Realize();
}
diff --git a/core/fxge/dib/cfx_dibbase.h b/core/fxge/dib/cfx_dibbase.h
index 98febad..8baeb28 100644
--- a/core/fxge/dib/cfx_dibbase.h
+++ b/core/fxge/dib/cfx_dibbase.h
@@ -15,7 +15,7 @@
#include "core/fxge/dib/fx_dib.h"
#include "third_party/base/containers/span.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
@@ -25,9 +25,9 @@
class PauseIndicatorIface;
struct FX_RECT;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
class SkImage;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
// Base class for all Device-Independent Bitmaps.
class CFX_DIBBase : public Retainable {
@@ -44,7 +44,7 @@
virtual pdfium::span<const uint8_t> GetScanline(int line) const = 0;
virtual bool SkipToScanline(int line, PauseIndicatorIface* pPause) const;
virtual size_t GetEstimatedImageMemoryBurden() const;
-#if BUILDFLAG(IS_WIN) || defined(_SKIA_SUPPORT_)
+#if BUILDFLAG(IS_WIN) || defined(PDF_USE_SKIA)
// Calls Realize() if needed. Otherwise, return `this`.
virtual RetainPtr<const CFX_DIBitmap> RealizeIfNeeded() const;
#endif
@@ -93,13 +93,13 @@
int& src_top,
const CFX_ClipRgn* pClipRgn) const;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// Realizes an `SkImage` from this DIB.
//
// This may share the underlying pixels, in which case, this DIB should not be
// modified during the lifetime of the `SkImage`.
virtual sk_sp<SkImage> RealizeSkImage() const;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
protected:
CFX_DIBBase();
@@ -115,10 +115,10 @@
int src_top,
DataVector<uint32_t>* pal);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// Whether alpha is premultiplied (if `IsAlphaFormat()`).
virtual bool IsPremultiplied() const;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
RetainPtr<CFX_DIBitmap> ClipToInternal(const FX_RECT* pClip) const;
void BuildPalette();
diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp
index 28311c4..17c887c 100644
--- a/core/fxge/dib/cfx_dibitmap.cpp
+++ b/core/fxge/dib/cfx_dibitmap.cpp
@@ -110,7 +110,7 @@
return result;
}
-#if BUILDFLAG(IS_WIN) || defined(_SKIA_SUPPORT_)
+#if BUILDFLAG(IS_WIN) || defined(PDF_USE_SKIA)
RetainPtr<const CFX_DIBitmap> CFX_DIBitmap::RealizeIfNeeded() const {
if (GetBuffer().empty()) {
return Realize();
@@ -493,7 +493,7 @@
return true;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
uint32_t CFX_DIBitmap::GetPixel(int x, int y) const {
if (!m_pBuffer)
return 0;
@@ -604,7 +604,7 @@
break;
}
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
void CFX_DIBitmap::ConvertBGRColorScale(uint32_t forecolor,
uint32_t backcolor) {
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h
index e59644d..f603aa5 100644
--- a/core/fxge/dib/cfx_dibitmap.h
+++ b/core/fxge/dib/cfx_dibitmap.h
@@ -36,7 +36,7 @@
// CFX_DIBBase
pdfium::span<const uint8_t> GetScanline(int line) const override;
size_t GetEstimatedImageMemoryBurden() const override;
-#if BUILDFLAG(IS_WIN) || defined(_SKIA_SUPPORT_)
+#if BUILDFLAG(IS_WIN) || defined(PDF_USE_SKIA)
RetainPtr<const CFX_DIBitmap> RealizeIfNeeded() const override;
#endif
@@ -55,10 +55,10 @@
bool ConvertFormat(FXDIB_Format format);
void Clear(uint32_t color);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
uint32_t GetPixel(int x, int y) const;
void SetPixel(int x, int y, uint32_t color);
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
bool SetRedFromBitmap(const RetainPtr<CFX_DIBBase>& pSrcBitmap);
bool SetAlphaFromBitmap(const RetainPtr<CFX_DIBBase>& pSrcBitmap);
@@ -127,7 +127,7 @@
FXDIB_Format format,
uint32_t pitch);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// Converts to un-pre-multiplied alpha if necessary.
void UnPreMultiply();
@@ -137,14 +137,14 @@
#endif
protected:
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool IsPremultiplied() const override;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
private:
enum class Channel : uint8_t { kRed, kAlpha };
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied };
#endif
@@ -179,7 +179,7 @@
int src_top);
MaybeOwned<uint8_t, FxFreeDeleter> m_pBuffer;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
Format m_nFormat = Format::kCleared;
#endif
};
diff --git a/core/fxge/dib/cfx_dibitmap_unittest.cpp b/core/fxge/dib/cfx_dibitmap_unittest.cpp
index ef448c2..d37faf4 100644
--- a/core/fxge/dib/cfx_dibitmap_unittest.cpp
+++ b/core/fxge/dib/cfx_dibitmap_unittest.cpp
@@ -113,7 +113,7 @@
FXDIB_Format::k8bppRgb, 0));
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
TEST(CFX_DIBitmap, UnPreMultiply_FromCleared) {
auto bitmap = pdfium::MakeRetain<CFX_DIBitmap>();
ASSERT_TRUE(bitmap->Create(1, 1, FXDIB_Format::kArgb));
@@ -145,4 +145,4 @@
EXPECT_THAT(bitmap->GetBuffer(), ElementsAre(0xff, 0xff, 0xff, 0x7f));
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h
index 7770f7f..daa48cd 100644
--- a/core/fxge/fx_font.h
+++ b/core/fxge/fx_font.h
@@ -43,7 +43,7 @@
constexpr uint16_t kNamePlatformMac = 1;
constexpr uint16_t kNamePlatformWindows = 3;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
class SkTypeface;
using CFX_TypeFace = SkTypeface;
diff --git a/core/fxge/renderdevicedriver_iface.cpp b/core/fxge/renderdevicedriver_iface.cpp
index 1b97a08..9fe811c 100644
--- a/core/fxge/renderdevicedriver_iface.cpp
+++ b/core/fxge/renderdevicedriver_iface.cpp
@@ -71,7 +71,7 @@
return false;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
bool RenderDeviceDriverIface::SetBitsWithMask(
const RetainPtr<CFX_DIBBase>& pBitmap,
const RetainPtr<CFX_DIBBase>& pMask,
diff --git a/core/fxge/renderdevicedriver_iface.h b/core/fxge/renderdevicedriver_iface.h
index 4f9690b..bfa4fb7 100644
--- a/core/fxge/renderdevicedriver_iface.h
+++ b/core/fxge/renderdevicedriver_iface.h
@@ -108,7 +108,7 @@
const FX_RECT& clip_rect,
int alpha,
bool bAlphaMode);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
virtual bool SetBitsWithMask(const RetainPtr<CFX_DIBBase>& pBitmap,
const RetainPtr<CFX_DIBBase>& pMask,
int left,
diff --git a/core/fxge/win32/cgdi_device_driver.cpp b/core/fxge/win32/cgdi_device_driver.cpp
index 03ca78c..b315a09 100644
--- a/core/fxge/win32/cgdi_device_driver.cpp
+++ b/core/fxge/win32/cgdi_device_driver.cpp
@@ -200,7 +200,7 @@
return result;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// TODO(caryclark) This antigrain function is duplicated here to permit
// removing the last remaining dependency. Eventually, this will be elminiated
// altogether and replace by Skia code.
@@ -306,7 +306,7 @@
}
return np;
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
unsigned LineClip(float w,
float h,
@@ -316,7 +316,7 @@
float y2,
float* x,
float* y) {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
// TODO(caryclark) temporary replacement of antigrain in line function to
// permit removing antigrain altogether
diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 8a6b1a2..f8809a4 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -316,7 +316,7 @@
if (!renderer.GetResult())
return nullptr;
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
result_bitmap->UnPreMultiply();
}
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp
index 4631338..ebb030b 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -34,9 +34,9 @@
#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
#endif // PDF_ENABLE_XFA
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
class SkCanvas;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
#ifdef PDF_ENABLE_XFA
static_assert(static_cast<int>(AlertButton::kDefault) ==
@@ -200,7 +200,7 @@
CFX_Matrix matrix = pPage->GetDisplayMatrix(rect, rotate);
auto pDevice = std::make_unique<CFX_DefaultRenderDevice>();
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer() && canvas) {
pDevice->AttachCanvas(reinterpret_cast<SkCanvas*>(canvas));
}
@@ -689,7 +689,7 @@
rotate, flags);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
FPDF_EXPORT void FPDF_CALLCONV FPDF_FFLDrawSkia(FPDF_FORMHANDLE hHandle,
FPDF_SKIA_CANVAS canvas,
FPDF_PAGE page,
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index 3f91714..fe4fdb4 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -70,11 +70,11 @@
size_y, rotate, flags, color_scheme,
/*need_to_restore=*/false, &pause_adapter);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
if (!context->m_pRenderer) {
return FPDF_RENDER_FAILED;
@@ -114,11 +114,11 @@
CPDFSDK_PauseAdapter pause_adapter(pause);
pContext->m_pRenderer->Continue(&pause_adapter);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pContext->m_pDevice->GetBitmap()->UnPreMultiply();
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
return ToFPDFStatus(pContext->m_pRenderer->GetStatus());
}
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index e0eb81a..77dc3ae 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -70,9 +70,9 @@
#include "core/fpdfapi/render/cpdf_windowsrenderdevice.h"
#include "public/fpdf_edit.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
class SkCanvas;
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
// These checks are here because core/ and public/ cannot depend on each other.
static_assert(static_cast<int>(WindowsPrintMode::kEmf) == FPDF_PRINTMODE_EMF,
@@ -104,7 +104,7 @@
"WindowsPrintMode::kPostScript3Type42PassThrough value mismatch");
#endif // BUILDFLAG(IS_WIN)
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// These checks are here because core/ and public/ cannot depend on each other.
static_assert(static_cast<int>(CFX_DefaultRenderDevice::RendererType::kAgg) ==
FPDF_RENDERERTYPE_AGG,
@@ -112,7 +112,7 @@
static_assert(static_cast<int>(CFX_DefaultRenderDevice::RendererType::kSkia) ==
FPDF_RENDERERTYPE_SKIA,
"CFX_DefaultRenderDevice::RendererType::kSkia value mismatch");
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
namespace {
@@ -127,7 +127,7 @@
// AGG is always present in a build. |FPDF_RENDERERTYPE_SKIA| is valid to use
// only if it is included in the build.
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// This build configuration has the option for runtime renderer selection.
if (public_type == FPDF_RENDERERTYPE_AGG ||
public_type == FPDF_RENDERERTYPE_SKIA) {
@@ -143,7 +143,7 @@
}
void ResetRendererType() {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_DefaultRenderDevice::SetRendererType(
CFX_DefaultRenderDevice::kDefaultRenderer);
#endif
@@ -235,7 +235,7 @@
CFX_GEModule::Create(config ? config->m_pUserFontPaths : nullptr);
CPDF_PageModule::Create();
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_GlyphCache::InitializeGlobals();
#endif
@@ -267,7 +267,7 @@
CPDFXFA_ModuleDestroy();
#endif // PDF_ENABLE_XFA
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CFX_GlyphCache::DestroyGlobals();
#endif
@@ -628,7 +628,7 @@
/*need_to_restore=*/true,
/*pause=*/nullptr);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
@@ -722,7 +722,7 @@
/*need_to_restore=*/true,
/*pause=*/nullptr);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
if (CFX_DefaultRenderDevice::UseSkiaRenderer()) {
pBitmap->UnPreMultiply();
}
@@ -766,7 +766,7 @@
/*color_scheme=*/nullptr);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
FPDF_EXPORT void FPDF_CALLCONV FPDF_RenderPageSkia(FPDF_SKIA_CANVAS canvas,
FPDF_PAGE page,
int size_x,
@@ -793,7 +793,7 @@
/*color_scheme=*/nullptr,
/*need_to_restore=*/true, /*pause=*/nullptr);
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
FPDF_EXPORT void FPDF_CALLCONV FPDF_ClosePage(FPDF_PAGE page) {
if (!page)
diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index 15464dd..f02d501 100644
--- a/fpdfsdk/fpdf_view_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -312,7 +312,7 @@
CHK(FPDFPage_FormFieldZOrderAtPoint);
CHK(FPDFPage_HasFormFieldAtPoint);
CHK(FPDF_FFLDraw);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CHK(FPDF_FFLDrawSkia);
#endif
CHK(FPDF_GetFormType);
@@ -521,7 +521,7 @@
#endif
CHK(FPDF_RenderPageBitmap);
CHK(FPDF_RenderPageBitmapWithMatrix);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
CHK(FPDF_RenderPageSkia);
#endif
#if defined(_WIN32)
diff --git a/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 610890d..33b8ebf 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -27,7 +27,7 @@
#include "testing/utils/hash.h"
#include "testing/utils/path_service.h"
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#include "third_party/skia/include/core/SkCanvas.h" // nogncheck
#include "third_party/skia/include/core/SkColor.h" // nogncheck
#include "third_party/skia/include/core/SkColorType.h" // nogncheck
@@ -38,7 +38,7 @@
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#include "third_party/skia/include/core/SkSize.h" // nogncheck
#include "third_party/skia/include/core/SkSurface.h" // nogncheck
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
using pdfium::ManyRectanglesChecksum;
@@ -109,7 +109,7 @@
~MockDownloadHints() = default;
};
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
ScopedFPDFBitmap SkImageToPdfiumBitmap(const SkImage& image) {
ScopedFPDFBitmap bitmap(
FPDFBitmap_Create(image.width(), image.height(), /*alpha=*/1));
@@ -149,7 +149,7 @@
return SkImageToPdfiumBitmap(*image);
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
} // namespace
@@ -227,7 +227,7 @@
page, format, /*bitmap_stride=*/0, expected_checksum);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
void TestRenderPageSkp(FPDF_PAGE page, const char* expected_checksum) {
int width = static_cast<int>(FPDF_GetPageWidth(page));
int height = static_cast<int>(FPDF_GetPageHeight(page));
@@ -248,7 +248,7 @@
std::move(picture), SkISize::Make(width, height));
CompareBitmap(bitmap.get(), width, height, expected_checksum);
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
private:
void TestRenderPageBitmapWithExternalMemoryImpl(
@@ -2053,7 +2053,7 @@
UnloadPage(page);
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
TEST_F(FPDFViewEmbedderTest, RenderPageToSkp) {
if (!CFX_DefaultRenderDevice::UseSkiaRenderer()) {
GTEST_SKIP() << "FPDF_RenderPageSkp() only makes sense with Skia";
@@ -2132,7 +2132,7 @@
EmbedderTestEnvironment::GetInstance()->TearDown();
EmbedderTestEnvironment::GetInstance()->SetUp();
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
TEST_F(FPDFViewEmbedderTest, NoSmoothTextItalicOverlappingGlyphs) {
ASSERT_TRUE(OpenDocument("bug_1919.pdf"));
diff --git a/fxbarcode/cfx_barcode_unittest.cpp b/fxbarcode/cfx_barcode_unittest.cpp
index d7a43c2..8276109 100644
--- a/fxbarcode/cfx_barcode_unittest.cpp
+++ b/fxbarcode/cfx_barcode_unittest.cpp
@@ -65,7 +65,7 @@
};
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Code39 DISABLED_Code39
#else
#define MAYBE_Code39 Code39
@@ -78,7 +78,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_CodaBar DISABLED_CodaBar
#else
#define MAYBE_CodaBar CodaBar
@@ -96,7 +96,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Code128 DISABLED_Code128
#else
#define MAYBE_Code128 Code128
@@ -109,7 +109,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Code128B DISABLED_Code128B
#else
#define MAYBE_Code128B Code128B
@@ -122,7 +122,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Code128C DISABLED_Code128C
#else
#define MAYBE_Code128C Code128C
@@ -135,7 +135,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Code128CLetters DISABLED_Code128CLetters
#else
#define MAYBE_Code128CLetters Code128CLetters
@@ -148,7 +148,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Ean8 DISABLED_Ean8
#else
#define MAYBE_Ean8 Ean8
@@ -166,7 +166,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_UPCA DISABLED_UPCA
#else
#define MAYBE_UPCA UPCA
@@ -184,7 +184,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Ean13 DISABLED_Ean13
#else
#define MAYBE_Ean13 Ean13
@@ -202,7 +202,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_Pdf417 DISABLED_Pdf417
#else
#define MAYBE_Pdf417 Pdf417
@@ -215,7 +215,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_DataMatrix DISABLED_DataMatrix
#else
#define MAYBE_DataMatrix DataMatrix
@@ -228,7 +228,7 @@
}
// https://crbug.com/pdfium/738
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
#define MAYBE_QrCode DISABLED_QrCode
#else
#define MAYBE_QrCode QrCode
diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h
index a0769b7..9e36853 100644
--- a/public/fpdf_formfill.h
+++ b/public/fpdf_formfill.h
@@ -1912,7 +1912,7 @@
int rotate,
int flags);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
FPDF_EXPORT void FPDF_CALLCONV FPDF_FFLDrawSkia(FPDF_FORMHANDLE hHandle,
FPDF_SKIA_CANVAS canvas,
FPDF_PAGE page,
diff --git a/public/fpdfview.h b/public/fpdfview.h
index c066e6c..580c524 100644
--- a/public/fpdfview.h
+++ b/public/fpdfview.h
@@ -935,7 +935,7 @@
const FS_RECTF* clipping,
int flags);
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
// Experimental API.
// Function: FPDF_RenderPageSkia
// Render contents of a page to a Skia SkCanvas.
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index a59b8ea..dcc9f49 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -18,8 +18,8 @@
#include <string>
#include <vector>
-#if defined(PDF_ENABLE_SKIA) && !defined(_SKIA_SUPPORT_)
-#define _SKIA_SUPPORT_
+#if defined(PDF_ENABLE_SKIA) && !defined(PDF_USE_SKIA)
+#define PDF_USE_SKIA
#endif
#include "public/cpp/fpdf_scopers.h"
diff --git a/testing/command_line_helpers.cpp b/testing/command_line_helpers.cpp
index 758f278..ea10998 100644
--- a/testing/command_line_helpers.cpp
+++ b/testing/command_line_helpers.cpp
@@ -15,7 +15,7 @@
}
FPDF_RENDERER_TYPE GetDefaultRendererType() {
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
return FPDF_RENDERERTYPE_SKIA;
#else
return FPDF_RENDERERTYPE_AGG;
diff --git a/testing/embedder_test_environment.cpp b/testing/embedder_test_environment.cpp
index da54048..91b0549 100644
--- a/testing/embedder_test_environment.cpp
+++ b/testing/embedder_test_environment.cpp
@@ -74,7 +74,7 @@
write_pngs_ = true;
return;
}
-#if defined(_SKIA_SUPPORT_)
+#if defined(PDF_USE_SKIA)
std::string value;
if (ParseSwitchKeyValue(flag, "--use-renderer=", &value)) {
if (value == "agg") {
@@ -87,7 +87,7 @@
}
return;
}
-#endif // defined(_SKIA_SUPPORT_)
+#endif // defined(PDF_USE_SKIA)
std::cerr << "Unknown flag: " << flag << "\n";
}
diff --git a/xfa/fde/cfde_textout_unittest.cpp b/xfa/fde/cfde_textout_unittest.cpp
index 01f9f99..737375a 100644
--- a/xfa/fde/cfde_textout_unittest.cpp
+++ b/xfa/fde/cfde_textout_unittest.cpp
@@ -27,8 +27,8 @@
~CFDETextOutTest() override = default;
void SetUp() override {
-#if defined(_SKIA_SUPPORT_)
- CFX_GlyphCache::InitializeGlobals();
+#if defined(PDF_USE_SKIA)
+ CFX_GlyphCache::InitializeGlobals();
#endif
CFX_Size bitmap_size = GetBitmapSize();
bitmap_ = pdfium::MakeRetain<CFX_DIBitmap>();
@@ -54,8 +54,8 @@
font_.Reset();
device_.reset();
bitmap_.Reset();
-#if defined(_SKIA_SUPPORT_)
- CFX_GlyphCache::DestroyGlobals();
+#if defined(PDF_USE_SKIA)
+ CFX_GlyphCache::DestroyGlobals();
#endif
}
