Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Unified Diff: xfa/fxfa/app/xfa_ffwidget.cpp

Issue 2648773003: Replace CXFA_StrokeArray and CXFA_WidgetArray with std::vector (Closed)
Patch Set: remove if Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/app/xfa_ffpageview.cpp ('k') | xfa/fxfa/parser/cxfa_box.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/app/xfa_ffwidget.cpp
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 64aed4f328ed0d996eaf6353ca7922a84a29a672..c1822470e083dea997f7ac757dfaf30a88245ef2 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -1217,7 +1217,7 @@ static void XFA_BOX_GetPath_Arc(CXFA_Box box,
startAngle, sweepAngle);
}
static void XFA_BOX_GetPath(CXFA_Box box,
- const CXFA_StrokeArray& strokes,
+ const std::vector<CXFA_Stroke>& strokes,
CFX_RectF rtWidget,
CFX_Path& path,
int32_t nIndex,
@@ -1385,7 +1385,7 @@ static void XFA_BOX_GetPath(CXFA_Box box,
}
}
static void XFA_BOX_GetFillPath(CXFA_Box box,
- const CXFA_StrokeArray& strokes,
+ const std::vector<CXFA_Stroke>& strokes,
CFX_RectF rtWidget,
CFX_Path& fillPath,
uint16_t dwFlags) {
@@ -1631,7 +1631,7 @@ static void XFA_BOX_Fill_Linear(CXFA_Box box,
pGS->FillPath(&fillPath, FXFILL_WINDING, pMatrix);
}
static void XFA_BOX_Fill(CXFA_Box box,
- const CXFA_StrokeArray& strokes,
+ const std::vector<CXFA_Stroke>& strokes,
CFX_Graphics* pGS,
const CFX_RectF& rtWidget,
CFX_Matrix* pMatrix,
@@ -1870,7 +1870,7 @@ static void XFA_BOX_Stroke_3DRect_Embossed(CFX_Graphics* pGS,
XFA_Draw3DRect(pGS, rtInner, fHalfWidth, pMatrix, 0xFF000000, 0xFF808080);
}
static void XFA_BOX_Stroke_Rect(CXFA_Box box,
- const CXFA_StrokeArray& strokes,
+ const std::vector<CXFA_Stroke>& strokes,
CFX_Graphics* pGS,
CFX_RectF rtWidget,
CFX_Matrix* pMatrix) {
@@ -1961,7 +1961,7 @@ static void XFA_BOX_Stroke_Rect(CXFA_Box box,
}
}
static void XFA_BOX_Stroke(CXFA_Box box,
- const CXFA_StrokeArray& strokes,
+ const std::vector<CXFA_Stroke>& strokes,
CFX_Graphics* pGS,
CFX_RectF rtWidget,
CFX_Matrix* pMatrix,
@@ -2038,10 +2038,10 @@ void XFA_DrawBox(CXFA_Box box,
eType != XFA_Element::Rectangle) {
return;
}
- CXFA_StrokeArray strokes;
- if (!(dwFlags & XFA_DRAWBOX_ForceRound) && eType != XFA_Element::Arc) {
- box.GetStrokes(strokes);
- }
+ std::vector<CXFA_Stroke> strokes;
+ if (!(dwFlags & XFA_DRAWBOX_ForceRound) && eType != XFA_Element::Arc)
+ box.GetStrokes(&strokes);
+
XFA_BOX_Fill(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
XFA_BOX_Stroke(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
}
« no previous file with comments | « xfa/fxfa/app/xfa_ffpageview.cpp ('k') | xfa/fxfa/parser/cxfa_box.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698