Replace defined(OS_APPLE) with BUILDFLAG(IS_APPLE).
Bug: chromium:1234043
Change-Id: I35f293235e7fad0547ca2aa8d377f9f2be9c43c6
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/89230
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 7b2d476..5dcd97b 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1029,7 +1029,7 @@
DestroyPlatform();
}
-#if !defined(OS_APPLE)
+#if !BUILDFLAG(IS_APPLE)
void CFX_AggDeviceDriver::InitPlatform() {}
void CFX_AggDeviceDriver::DestroyPlatform() {}
@@ -1043,7 +1043,7 @@
const CFX_TextRenderOptions& options) {
return false;
}
-#endif // !defined(OS_APPLE)
+#endif // !BUILDFLAG(IS_APPLE)
DeviceType CFX_AggDeviceDriver::GetDeviceType() const {
return DeviceType::kDisplay;
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 51fe418..e408408 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -107,7 +107,7 @@
RetainPtr<CFX_DIBitmap> const m_pBitmap;
std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
std::vector<std::unique_ptr<CFX_ClipRgn>> m_StateStack;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
void* m_pPlatformGraphics = nullptr;
#endif
CFX_FillRenderOptions m_FillOptions;
diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
index 771851c..c08fe96 100644
--- a/core/fxge/cfx_font.cpp
+++ b/core/fxge/cfx_font.cpp
@@ -361,7 +361,7 @@
m_FontData = {}; // m_FontData can't outive m_Face.
m_Face.Reset();
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
ReleasePlatformResource();
#endif
}
diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h
index a45fc3b..b506f36 100644
--- a/core/fxge/cfx_font.h
+++ b/core/fxge/cfx_font.h
@@ -140,7 +140,7 @@
bool IsSubstFontBold() const;
#endif
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
void* GetPlatformFont() const { return m_pPlatformFont; }
void SetPlatformFont(void* font) { m_pPlatformFont = font; }
#endif
@@ -148,7 +148,7 @@
private:
RetainPtr<CFX_GlyphCache> GetOrCreateGlyphCache() const;
void ClearGlyphCache();
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
void ReleasePlatformResource();
#endif
ByteString GetFamilyNameOrUntitled() const;
@@ -169,7 +169,7 @@
uint64_t m_ObjectTag = 0;
bool m_bEmbedded = false;
bool m_bVertical = false;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
void* m_pPlatformFont = nullptr;
#endif
};
diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index 56b393e..35bd091 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -604,7 +604,7 @@
}
} else {
if (Charset == FX_Charset::kSymbol) {
-#if defined(OS_APPLE) || defined(OS_ANDROID)
+#if BUILDFLAG(IS_APPLE) || defined(OS_ANDROID)
if (SubstName == "Symbol") {
pSubstFont->m_Family = "Chrome Symbol";
pSubstFont->m_Charset = FX_Charset::kSymbol;
diff --git a/core/fxge/cfx_gemodule.h b/core/fxge/cfx_gemodule.h
index 47e23ec..6c7caae 100644
--- a/core/fxge/cfx_gemodule.h
+++ b/core/fxge/cfx_gemodule.h
@@ -13,7 +13,7 @@
#include "build/build_config.h"
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
#include "third_party/base/span.h"
#endif
@@ -31,7 +31,7 @@
virtual void Init() = 0;
virtual std::unique_ptr<SystemFontInfoIface>
CreateDefaultSystemFontInfo() = 0;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
virtual void* CreatePlatformFont(pdfium::span<const uint8_t> font_span) = 0;
#endif
};
diff --git a/core/fxge/cfx_glyphcache.cpp b/core/fxge/cfx_glyphcache.cpp
index 82fa8d4..49abaeb 100644
--- a/core/fxge/cfx_glyphcache.cpp
+++ b/core/fxge/cfx_glyphcache.cpp
@@ -36,7 +36,7 @@
#endif
#endif
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
#include "core/fxge/cfx_textrenderoptions.h"
#endif
@@ -253,7 +253,7 @@
return nullptr;
UniqueKeyGen keygen;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
const bool bNative = text_options->native_text;
#else
const bool bNative = false;
@@ -261,7 +261,7 @@
GenKey(&keygen, pFont, matrix, dest_width, anti_alias, bNative);
ByteString FaceGlyphsKey(keygen.key_, keygen.key_len_);
-#if defined(OS_APPLE) && !defined(_SKIA_SUPPORT_) && \
+#if BUILDFLAG(IS_APPLE) && !defined(_SKIA_SUPPORT_) && \
!defined(_SKIA_SUPPORT_PATHS_)
const bool bDoLookUp = !text_options->native_text;
#else
@@ -272,7 +272,7 @@
bFontStyle, dest_width, anti_alias);
}
-#if defined(OS_APPLE) && !defined(_SKIA_SUPPORT_) && \
+#if BUILDFLAG(IS_APPLE) && !defined(_SKIA_SUPPORT_) && \
!defined(_SKIA_SUPPORT_PATHS_)
std::unique_ptr<CFX_GlyphBitmap> pGlyphBitmap;
auto it = m_SizeMap.find(FaceGlyphsKey);
@@ -329,7 +329,7 @@
}
#endif // defined(_SKIA_SUPPORT_) || defined(_SKIA_SUPPORT_PATHS_)
-#if !defined(OS_APPLE)
+#if !BUILDFLAG(IS_APPLE)
void CFX_GlyphCache::InitPlatform() {}
#endif
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index dd472d5..1606a05 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -301,7 +301,7 @@
bool ShouldDrawDeviceText(const CFX_Font* pFont,
const CFX_TextRenderOptions& options) {
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
if (options.font_is_cid)
return false;
diff --git a/core/fxge/dib/cfx_dibbase.h b/core/fxge/dib/cfx_dibbase.h
index 4052f41..aebdb03 100644
--- a/core/fxge/dib/cfx_dibbase.h
+++ b/core/fxge/dib/cfx_dibbase.h
@@ -23,12 +23,12 @@
// Base class for all Device-Independent Bitmaps.
class CFX_DIBBase : public Retainable {
public:
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
// Matches Apple's kCGBitmapByteOrder32Little in fx_quartz_device.cpp.
static constexpr FXDIB_Format kPlatformRGBFormat = FXDIB_Format::kRgb32;
-#else // defined(OS_APPLE)
+#else // BUILDFLAG(IS_APPLE)
static constexpr FXDIB_Format kPlatformRGBFormat = FXDIB_Format::kRgb;
-#endif // defined(OS_APPLE)
+#endif // BUILDFLAG(IS_APPLE)
~CFX_DIBBase() override;
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 5c1adcd..4f9cd05 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -944,7 +944,7 @@
m_charDetails.SetGlyphAt(cur_index,
static_cast<uint16_t>(cp.m_GlyphIndex));
m_charDetails.SetFontCharWidthAt(cur_index, cp.m_FontCharWidth);
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
if (cp.m_ExtGID) {
m_charDetails.SetGlyphAt(cur_index, static_cast<uint16_t>(cp.m_ExtGID));
}
@@ -1750,7 +1750,7 @@
}
}
glyphs[index] = static_cast<uint16_t>(cp.m_GlyphIndex);
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
if (cp.m_ExtGID)
glyphs[index] = static_cast<uint16_t>(cp.m_ExtGID);
#endif
diff --git a/core/fxge/text_char_pos.h b/core/fxge/text_char_pos.h
index b28d249..6be2671 100644
--- a/core/fxge/text_char_pos.h
+++ b/core/fxge/text_char_pos.h
@@ -20,7 +20,7 @@
uint32_t m_Unicode = 0;
uint32_t m_GlyphIndex = 0;
int m_FontCharWidth = 0;
-#if defined(OS_APPLE)
+#if BUILDFLAG(IS_APPLE)
uint32_t m_ExtGID = 0;
#endif
int32_t m_FallbackFontPosition = 0;
