diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-25 11:17:16 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-25 11:17:16 -0800 |
| commit | ea1ae9915d1702ab62af520b1487f70a553fc6ae (patch) | |
| tree | 2fb77cd9537fa4e5a9b02895343d5abe20b51356 /xfa/src/fxfa/src/app/xfa_ffwidget.cpp | |
| parent | f014768833406e68234eeb4f8ba94cabf766dff3 (diff) | |
| download | pdfium-ea1ae9915d1702ab62af520b1487f70a553fc6ae.tar.xz | |
Make CFX_PSVTemplate simpler.
Add default ctor so we don't have to zero these out.
Also, make CFX_VTemplate simpler.
Also, remove the Set() method in favor of assignment.
Also, remove CFX_FloatPoint define.
Also, remove unused (and wrong) CFX_VTemplate methods.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1733523003 .
Diffstat (limited to 'xfa/src/fxfa/src/app/xfa_ffwidget.cpp')
| -rw-r--r-- | xfa/src/fxfa/src/app/xfa_ffwidget.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp index 0f48d5d4a5..47042f71af 100644 --- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp @@ -1510,26 +1510,27 @@ static void XFA_BOX_Fill_Linear(CXFA_Box box, CFX_RectF rtFill, CFX_Matrix* pMatrix) { CXFA_Fill fill = box.GetFill(); - FX_ARGB crStart, crEnd; - crStart = fill.GetColor(); + FX_ARGB crStart = fill.GetColor(); + FX_ARGB crEnd; int32_t iType = fill.GetLinear(crEnd); - CFX_PointF ptStart, ptEnd; + CFX_PointF ptStart; + CFX_PointF ptEnd; switch (iType) { case XFA_ATTRIBUTEENUM_ToRight: - ptStart.Set(rtFill.left, rtFill.top); - ptEnd.Set(rtFill.right(), rtFill.top); + ptStart = CFX_PointF(rtFill.left, rtFill.top); + ptEnd = CFX_PointF(rtFill.right(), rtFill.top); break; case XFA_ATTRIBUTEENUM_ToBottom: - ptStart.Set(rtFill.left, rtFill.top); - ptEnd.Set(rtFill.left, rtFill.bottom()); + ptStart = CFX_PointF(rtFill.left, rtFill.top); + ptEnd = CFX_PointF(rtFill.left, rtFill.bottom()); break; case XFA_ATTRIBUTEENUM_ToLeft: - ptStart.Set(rtFill.right(), rtFill.top); - ptEnd.Set(rtFill.left, rtFill.top); + ptStart = CFX_PointF(rtFill.right(), rtFill.top); + ptEnd = CFX_PointF(rtFill.left, rtFill.top); break; case XFA_ATTRIBUTEENUM_ToTop: - ptStart.Set(rtFill.left, rtFill.bottom()); - ptEnd.Set(rtFill.left, rtFill.top); + ptStart = CFX_PointF(rtFill.left, rtFill.bottom()); + ptEnd = CFX_PointF(rtFill.left, rtFill.top); break; default: break; |