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/skia | |
| 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/skia')
| -rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 11 | ||||
| -rw-r--r-- | core/fxge/skia/fx_skia_device.h | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 190ad9e80c..598dc480c2 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -1960,7 +1960,7 @@ bool CFX_SkiaDeviceDriver::DrawCosmeticLine(const CFX_PointF& ptMoveTo, return false; } -bool CFX_SkiaDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, +bool CFX_SkiaDeviceDriver::FillRectWithBlend(const FX_RECT& rect, uint32_t fill_color, int blend_type) { m_pCache->FlushForDraw(); @@ -1968,11 +1968,10 @@ bool CFX_SkiaDeviceDriver::FillRectWithBlend(const FX_RECT* pRect, spaint.setAntiAlias(true); spaint.setColor(fill_color); spaint.setBlendMode(GetSkiaBlendMode(blend_type)); - SkRect rect = - SkRect::MakeLTRB(pRect->left, SkTMin(pRect->top, pRect->bottom), - pRect->right, SkTMax(pRect->bottom, pRect->top)); - DebugShowSkiaDrawRect(this, m_pCanvas, spaint, rect); - m_pCanvas->drawRect(rect, spaint); + SkRect srect = SkRect::MakeLTRB(rect.left, SkTMin(rect.top, rect.bottom), + rect.right, SkTMax(rect.bottom, rect.top)); + DebugShowSkiaDrawRect(this, m_pCanvas, spaint, srect); + m_pCanvas->drawRect(srect, spaint); return true; } diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index e545f9cd47..8fdd4fd03f 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -64,7 +64,7 @@ class CFX_SkiaDeviceDriver : public RenderDeviceDriverIface { 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; |