summaryrefslogtreecommitdiff
path: root/core/fxge/win32
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-05-19 06:17:50 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-19 06:17:50 -0700
commit7b214237e2be6a0d962987d222c73161620c0a27 (patch)
tree18b6336e63f834adedf55c5165a64ba3fcb07cc5 /core/fxge/win32
parentd1f843e7473263593fd153f1e3210761c29e5363 (diff)
downloadpdfium-7b214237e2be6a0d962987d222c73161620c0a27.tar.xz
Clean up CFX_RenderDevice::DrawNormalText().
Review-Url: https://codereview.chromium.org/1990583002
Diffstat (limited to 'core/fxge/win32')
-rw-r--r--core/fxge/win32/fx_win32_device.cpp12
-rw-r--r--core/fxge/win32/win32_int.h4
2 files changed, 6 insertions, 10 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index f8057e7d5d..3d96deb9e4 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -13,6 +13,7 @@
#include "core/fxge/agg/fx_agg_driver.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/fx_text_int.h"
+#include "core/fxge/include/fx_font.h"
#include "core/fxge/include/fx_freetype.h"
#include "core/fxge/include/fx_ge_win32.h"
#include "core/fxge/win32/dwrite_int.h"
@@ -627,8 +628,7 @@ FX_BOOL CGdiDeviceDriver::GDI_StretchBitMask(const CFX_DIBitmap* pBitmap1,
if (!pBitmap || dest_width == 0 || dest_height == 0) {
return FALSE;
}
- _Color2Argb(bitmap_color, bitmap_color, alpha_flag | (1 << 24),
- pIccTransform);
+ Color2Argb(bitmap_color, bitmap_color, alpha_flag | (1 << 24), pIccTransform);
int width = pBitmap->GetWidth(), height = pBitmap->GetHeight();
struct {
BITMAPINFOHEADER bmiHeader;
@@ -855,8 +855,8 @@ FX_BOOL CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData,
if (blend_type != FXDIB_BLEND_NORMAL) {
return FALSE;
}
- _Color2Argb(fill_color, fill_color, alpha_flag | (1 << 24), pIccTransform);
- _Color2Argb(stroke_color, stroke_color, alpha_flag, pIccTransform);
+ Color2Argb(fill_color, fill_color, alpha_flag | (1 << 24), pIccTransform);
+ Color2Argb(stroke_color, stroke_color, alpha_flag, pIccTransform);
CWin32Platform* pPlatform =
(CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
if (!(pGraphState || stroke_color == 0) &&
@@ -963,7 +963,7 @@ FX_BOOL CGdiDeviceDriver::FillRect(const FX_RECT* pRect,
if (blend_type != FXDIB_BLEND_NORMAL) {
return FALSE;
}
- _Color2Argb(fill_color, fill_color, alpha_flag | (1 << 24), pIccTransform);
+ Color2Argb(fill_color, fill_color, alpha_flag | (1 << 24), pIccTransform);
int alpha;
FX_COLORREF rgb;
ArgbDecode(fill_color, alpha, rgb);
@@ -1019,7 +1019,7 @@ FX_BOOL CGdiDeviceDriver::DrawCosmeticLine(FX_FLOAT x1,
if (blend_type != FXDIB_BLEND_NORMAL) {
return FALSE;
}
- _Color2Argb(color, color, alpha_flag | (1 << 24), pIccTransform);
+ Color2Argb(color, color, alpha_flag | (1 << 24), pIccTransform);
int a;
FX_COLORREF rgb;
ArgbDecode(color, a, rgb);
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 7916690817..619ac2fdae 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -361,9 +361,5 @@ class CPSPrinterDriver : public IFX_RenderDeviceDriver {
CPSOutput* m_pPSOutput;
CFX_PSRenderer m_PSRenderer;
};
-void _Color2Argb(FX_ARGB& argb,
- uint32_t color,
- int alpha_flag,
- void* pIccTransform);
#endif // CORE_FXGE_WIN32_WIN32_INT_H_