summaryrefslogtreecommitdiff
path: root/core/fxge/agg
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-26 16:24:49 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-27 01:04:13 +0000
commit698aed79d6ad6e8e3a0c7a500c108d69f944b82d (patch)
treefbf7e66e0a2ec096561cd0ba5d3c4d577cd64667 /core/fxge/agg
parent3070e94f608f36e7312fad2d471e3d7546f82ca2 (diff)
downloadpdfium-698aed79d6ad6e8e3a0c7a500c108d69f944b82d.tar.xz
Cleanup FX macros
This CL renames the FX_OS defines to have _OS_ in their names and drops the _DESKTOP suffix. The FXM defines have been changed to just FX. Change-Id: Iab172fba541713b5f6d14fb8098baf68e3364c74 Reviewed-on: https://pdfium-review.googlesource.com/14833 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/agg')
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp6
-rw-r--r--core/fxge/agg/fx_agg_driver.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 7f24378feb..b394facace 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1109,7 +1109,7 @@ CFX_AggDeviceDriver::CFX_AggDeviceDriver(
const RetainPtr<CFX_DIBitmap>& pOriDevice,
bool bGroupKnockout)
: m_pBitmap(pBitmap),
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
m_pPlatformGraphics(nullptr),
#endif
m_FillFlags(0),
@@ -1127,7 +1127,7 @@ uint8_t* CFX_AggDeviceDriver::GetBuffer() const {
return m_pBitmap->GetBuffer();
}
-#if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ != _FX_PLATFORM_APPLE_
void CFX_AggDeviceDriver::InitPlatform() {}
void CFX_AggDeviceDriver::DestroyPlatform() {}
@@ -1140,7 +1140,7 @@ bool CFX_AggDeviceDriver::DrawDeviceText(int nChars,
uint32_t color) {
return false;
}
-#endif // _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
+#endif // _FX_PLATFORM_ != _FX_PLATFORM_APPLE_
int CFX_AggDeviceDriver::GetDeviceCaps(int caps_id) const {
switch (caps_id) {
diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h
index 0afc7e3123..92500c3df6 100644
--- a/core/fxge/agg/fx_agg_driver.h
+++ b/core/fxge/agg/fx_agg_driver.h
@@ -112,7 +112,7 @@ class CFX_AggDeviceDriver : public IFX_RenderDeviceDriver {
RetainPtr<CFX_DIBitmap> m_pBitmap;
std::unique_ptr<CFX_ClipRgn> m_pClipRgn;
std::vector<std::unique_ptr<CFX_ClipRgn>> m_StateStack;
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
+#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
void* m_pPlatformGraphics;
#endif
int m_FillFlags;