summaryrefslogtreecommitdiff
path: root/core/src/fxge
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2015-08-06 15:08:57 -0700
committerNico Weber <thakis@chromium.org>2015-08-06 15:08:57 -0700
commit077f1a335560a8014e466c768c1e9d24c8a61ac9 (patch)
tree8d080d5e2fbef32e5d945129eb19ff9909b192f5 /core/src/fxge
parent792d55cfe3cf046125fd69d8914ae459216a68ab (diff)
downloadpdfium-077f1a335560a8014e466c768c1e9d24c8a61ac9.tar.xz
XFA: clang-format all pdfium code, again.
Also add a presubmit that checks for this so I don't have to keep doing it. No behavior change. Generated by: find . -name '*.cpp' -o -name '*.h' | \ grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \ xargs ../../buildtools/mac/clang-format -i Then manually merged https://codereview.chromium.org/1269223002/ See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion. BUG=none R=thestig@chromium.org Review URL: https://codereview.chromium.org/1277043002 .
Diffstat (limited to 'core/src/fxge')
-rw-r--r--core/src/fxge/agg/src/fx_agg_driver.cpp10
-rw-r--r--core/src/fxge/dib/fx_dib_engine.cpp2
-rw-r--r--core/src/fxge/ge/text_int.h6
-rw-r--r--core/src/fxge/skia/fx_skia_device.cpp6
4 files changed, 13 insertions, 11 deletions
diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp
index 993f50afad..2a4d199343 100644
--- a/core/src/fxge/agg/src/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/src/fx_agg_driver.cpp
@@ -187,7 +187,7 @@ IFX_RenderDeviceDriver* IFX_RenderDeviceDriver::CreateFxgeDriver(
CFX_DIBitmap* pOriDevice,
FX_BOOL bGroupKnockout) {
return new CFX_AggDeviceDriver(pBitmap, 0, bRgbByteOrder, pOriDevice,
- bGroupKnockout);
+ bGroupKnockout);
}
CFX_AggDeviceDriver::CFX_AggDeviceDriver(CFX_DIBitmap* pBitmap,
int dither_bits,
@@ -323,7 +323,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathFill(
m_FillFlags = fill_mode;
if (m_pClipRgn == NULL) {
m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH),
- GetDeviceCaps(FXDC_PIXEL_HEIGHT));
+ GetDeviceCaps(FXDC_PIXEL_HEIGHT));
if (!m_pClipRgn) {
return FALSE;
}
@@ -358,7 +358,7 @@ FX_BOOL CFX_AggDeviceDriver::SetClip_PathStroke(
const CFX_GraphStateData* pGraphState) {
if (m_pClipRgn == NULL) {
m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH),
- GetDeviceCaps(FXDC_PIXEL_HEIGHT));
+ GetDeviceCaps(FXDC_PIXEL_HEIGHT));
if (!m_pClipRgn) {
return FALSE;
}
@@ -1800,8 +1800,8 @@ FX_BOOL CFX_FxgeDevice::Create(int width,
return FALSE;
}
SetBitmap(pBitmap);
- IFX_RenderDeviceDriver* pDriver = new CFX_AggDeviceDriver(
- pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
+ IFX_RenderDeviceDriver* pDriver =
+ new CFX_AggDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
if (!pDriver) {
return FALSE;
}
diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp
index 86d495f28e..ce95a6e9ad 100644
--- a/core/src/fxge/dib/fx_dib_engine.cpp
+++ b/core/src/fxge/dib/fx_dib_engine.cpp
@@ -852,7 +852,7 @@ FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause) {
FX_BOOL CFX_ImageStretcher::StartStretch() {
m_pStretchEngine =
new CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight,
- m_ClipRect, m_pSource, m_Flags);
+ m_ClipRect, m_pSource, m_Flags);
if (!m_pStretchEngine) {
return FALSE;
}
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index 3ebd9aef3f..9279969e0a 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -67,8 +67,10 @@ class CFX_UnicodeEncoding : public IFX_FontEncoding {
class CFX_FontFaceInfo {
public:
- CFX_FontFaceInfo(CFX_ByteString filePath, CFX_ByteString faceName,
- CFX_ByteString fontTables, FX_DWORD fontOffset,
+ CFX_FontFaceInfo(CFX_ByteString filePath,
+ CFX_ByteString faceName,
+ CFX_ByteString fontTables,
+ FX_DWORD fontOffset,
FX_DWORD fileSize)
: m_FilePath(filePath),
m_FaceName(faceName),
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index a13c21889c..d7f448ebf6 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -266,7 +266,7 @@ CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap,
CFX_DIBitmap* pOriDevice,
FX_BOOL bGroupKnockout) {
m_pAggDriver = new CFX_AggDeviceDriver(pBitmap, dither_bits, bRgbByteOrder,
- pOriDevice, bGroupKnockout);
+ pOriDevice, bGroupKnockout);
}
CFX_SkiaDeviceDriver::~CFX_SkiaDeviceDriver() {
delete m_pAggDriver;
@@ -616,8 +616,8 @@ FX_BOOL CFX_SkiaDevice::Create(int width,
return FALSE;
}
SetBitmap(pBitmap);
- CFX_SkiaDeviceDriver* pDriver = new CFX_SkiaDeviceDriver(
- pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
+ CFX_SkiaDeviceDriver* pDriver =
+ new CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
SetDeviceDriver(pDriver);
return TRUE;
}