diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-04-10 17:55:46 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-10 17:55:46 +0000 |
| commit | 85ba2610cf05a75b52681f381bba2da3ba37b984 (patch) | |
| tree | dcf1553a49ca032eaadab986fdc12f1fcf893b59 /core/fxge/win32 | |
| parent | 537115b5a3ceccfe8ce2ca79577b61c5ec31c432 (diff) | |
| download | pdfium-85ba2610cf05a75b52681f381bba2da3ba37b984.tar.xz | |
Change FillRectWithBlend methods to take FX_RECT by const-ref.
They currently take const FX_RECT*, but the pointer is never nullptr.
Also add a comment to explain why FX_RECT is the way it is. It has the
same layout as a win32 RECT.
Change-Id: Icf0e4c3eb25fe03317590a736578e053b9dccf7a
Reviewed-on: https://pdfium-review.googlesource.com/30051
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxge/win32')
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 5 | ||||
| -rw-r--r-- | core/fxge/win32/win32_int.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index b857dde91b..337f9643d1 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -1061,7 +1061,7 @@ bool CGdiDeviceDriver::DrawPath(const CFX_PathData* pPathData, return true; } -bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, +bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT& rect, uint32_t fill_color, int blend_type) { if (blend_type != FXDIB_BLEND_NORMAL) @@ -1077,7 +1077,8 @@ bool CGdiDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, return false; HBRUSH hBrush = CreateSolidBrush(colorref); - ::FillRect(m_hDC, (RECT*)pRect, hBrush); + const RECT* pRect = reinterpret_cast<const RECT*>(&rect); + ::FillRect(m_hDC, pRect, hBrush); DeleteObject(hBrush); return true; } diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 34d307c2cd..b248522f0a 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -151,7 +151,7 @@ class CGdiDeviceDriver : public RenderDeviceDriverIface { uint32_t stroke_color, int fill_mode, int blend_type) override; - bool FillRectWithBlend(const FX_RECT* pRect, + bool FillRectWithBlend(const FX_RECT& rect, uint32_t fill_color, int blend_type) override; bool DrawCosmeticLine(const CFX_PointF& ptMoveTo, |