Work around unreachable block in CFWL_EditTP::DrawBackground()
The commit at
https://pdfium.googlesource.com/pdfium/+/c273e8f5006aa7d91d37a5da021dbbabb8721e5b
introduced new code at the start of the DrawBackground method which
prevents the CFWL_Part::CombTextLine case in the switch from being
reached later on. Remove the if-block and insert its code into
the switch.
Change-Id: I55338abc29ba514d2f9228ad2dce55ce988d2d7f
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/80110
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp
index 5188d0d..36cff36 100644
--- a/xfa/fwl/theme/cfwl_edittp.cpp
+++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -17,19 +17,6 @@
CFWL_EditTP::~CFWL_EditTP() = default;
void CFWL_EditTP::DrawBackground(const CFWL_ThemeBackground& pParams) {
- if (CFWL_Part::CombTextLine == pParams.m_iPart) {
- CFWL_Widget::AdapterIface* pWidget =
- pParams.m_pWidget->GetOutmost()->GetAdapterIface();
- FX_ARGB cr = 0xFF000000;
- float fWidth = 1.0f;
- pWidget->GetBorderColorAndThickness(&cr, &fWidth);
- pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(cr));
- pParams.m_pGraphics->SetLineWidth(fWidth);
- if (pParams.m_pPath)
- pParams.m_pGraphics->StrokePath(*pParams.m_pPath, pParams.m_matrix);
- return;
- }
-
switch (pParams.m_iPart) {
case CFWL_Part::Border: {
DrawBorder(pParams.m_pGraphics.Get(), pParams.m_PartRect,
@@ -69,8 +56,13 @@
break;
}
case CFWL_Part::CombTextLine: {
- pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(0xFF000000));
- pParams.m_pGraphics->SetLineWidth(1.0f);
+ CFWL_Widget::AdapterIface* pWidget =
+ pParams.m_pWidget->GetOutmost()->GetAdapterIface();
+ FX_ARGB cr = 0xFF000000;
+ float fWidth = 1.0f;
+ pWidget->GetBorderColorAndThickness(&cr, &fWidth);
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(cr));
+ pParams.m_pGraphics->SetLineWidth(fWidth);
if (pParams.m_pPath)
pParams.m_pGraphics->StrokePath(*pParams.m_pPath, pParams.m_matrix);
break;