diff options
author | dsinclair <dsinclair@chromium.org> | 2016-12-15 13:44:02 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-12-15 13:44:02 -0800 |
commit | 46a4bbf46723cd6375042d599d01fe08012eadd6 (patch) | |
tree | f0e0df5fce69c33557971c1bc52ff8b9c69dfaa0 /xfa/fwl/theme | |
parent | d92477068ad0918c97a5dab799d8cfdf07ce3580 (diff) | |
download | pdfium-46a4bbf46723cd6375042d599d01fe08012eadd6.tar.xz |
Cleanup widget edge related code
CFWL_Widget::HasEdge() always returns false. This CL removes it and the
supporting code.
Review-Url: https://codereview.chromium.org/2575093002
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r-- | xfa/fwl/theme/cfwl_barcodetp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_comboboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_datetimepickertp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_edittp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_listboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_monthcalendartp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_pictureboxtp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_pushbuttontp.cpp | 5 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.cpp | 25 | ||||
-rw-r--r-- | xfa/fwl/theme/cfwl_widgettp.h | 4 |
10 files changed, 0 insertions, 69 deletions
diff --git a/xfa/fwl/theme/cfwl_barcodetp.cpp b/xfa/fwl/theme/cfwl_barcodetp.cpp index f123857e51..f0bb22fded 100644 --- a/xfa/fwl/theme/cfwl_barcodetp.cpp +++ b/xfa/fwl/theme/cfwl_barcodetp.cpp @@ -27,11 +27,6 @@ void CFWL_BarcodeTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { FillBackground(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp index 3e06e665ae..10409a8eeb 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp @@ -36,11 +36,6 @@ void CFWL_ComboBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { CFX_Path path; path.Create(); diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.cpp b/xfa/fwl/theme/cfwl_datetimepickertp.cpp index ef8d0c869b..5c4c86aa21 100644 --- a/xfa/fwl/theme/cfwl_datetimepickertp.cpp +++ b/xfa/fwl/theme/cfwl_datetimepickertp.cpp @@ -26,11 +26,6 @@ void CFWL_DateTimePickerTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::DropDownButton: { DrawDropDownButton(pParams, &pParams->m_matrix); break; diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index f2fc5cb7a3..5d3447eaa2 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp @@ -45,11 +45,6 @@ void CFWL_EditTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { if (pParams->m_pPath) { CFX_Graphics* pGraphics = pParams->m_pGraphics; diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index 6f082a8729..2fc7ba7671 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp @@ -29,11 +29,6 @@ void CFWL_ListBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { FillSoildRect(pParams->m_pGraphics, ArgbEncode(255, 255, 255, 255), &pParams->m_rtPart, &pParams->m_matrix); diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 3684e77c66..13fabb34e5 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp @@ -68,11 +68,6 @@ void CFWL_MonthCalendarTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { DrawTotalBK(pParams, &pParams->m_matrix); break; diff --git a/xfa/fwl/theme/cfwl_pictureboxtp.cpp b/xfa/fwl/theme/cfwl_pictureboxtp.cpp index 75c60387b4..1d2f2ecd9c 100644 --- a/xfa/fwl/theme/cfwl_pictureboxtp.cpp +++ b/xfa/fwl/theme/cfwl_pictureboxtp.cpp @@ -27,11 +27,6 @@ void CFWL_PictureBoxTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } default: break; } diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp index 31f6b7ade1..5515ffb578 100644 --- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp +++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp @@ -31,11 +31,6 @@ void CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground* pParams) { DrawBorder(pParams->m_pGraphics, &pParams->m_rtPart, &pParams->m_matrix); break; } - case CFWL_Part::Edge: { - DrawEdge(pParams->m_pGraphics, pParams->m_pWidget->GetStyles(), - &pParams->m_rtPart, &pParams->m_matrix); - break; - } case CFWL_Part::Background: { CFX_RectF& rect = pParams->m_rtPart; FX_FLOAT fRight = rect.right(); diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 3b436d8302..3867257e0c 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp @@ -185,31 +185,6 @@ void CFWL_WidgetTP::FinalizeTTO() { m_pTextOut.reset(); } -void CFWL_WidgetTP::DrawEdge(CFX_Graphics* pGraphics, - uint32_t dwStyles, - const CFX_RectF* pRect, - CFX_Matrix* pMatrix) { - if (!pGraphics) - return; - if (!pRect) - return; - pGraphics->SaveGraphState(); - CFX_Color crStroke(ArgbEncode(255, 127, 157, 185)); - pGraphics->SetStrokeColor(&crStroke); - CFX_Path path; - path.Create(); - path.AddRectangle(pRect->left, pRect->top, pRect->width - 1, - pRect->height - 1); - pGraphics->StrokePath(&path, pMatrix); - path.Clear(); - crStroke.Set(ArgbEncode(255, 255, 255, 255)); - pGraphics->SetStrokeColor(&crStroke); - path.AddRectangle(pRect->left + 1, pRect->top + 1, pRect->width - 3, - pRect->height - 3); - pGraphics->StrokePath(&path, pMatrix); - pGraphics->RestoreGraphState(); -} - void CFWL_WidgetTP::Draw3DRect(CFX_Graphics* pGraphics, FWLTHEME_EDGE eType, FX_FLOAT fWidth, diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h index 761cc89415..90d697379c 100644 --- a/xfa/fwl/theme/cfwl_widgettp.h +++ b/xfa/fwl/theme/cfwl_widgettp.h @@ -134,10 +134,6 @@ class CFWL_WidgetTP { void InitTTO(); void FinalizeTTO(); - void DrawEdge(CFX_Graphics* pGraphics, - uint32_t dwStyles, - const CFX_RectF* pRect, - CFX_Matrix* pMatrix = nullptr); void Draw3DRect(CFX_Graphics* pGraphics, FWLTHEME_EDGE eType, FX_FLOAT fWidth, |