Move xfa/fxgraphics to xfa/fgas/graphics.
Then rename classes to CFGAS_GE* so to make them visually
distinguishable from the rest of CFXA_, which ought to be
garbage collected (this lower level library knows not of GC).
Change-Id: I4171e868f9ed22a99341732e87c8038db8ad85a3
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/74991
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fwl/BUILD.gn b/xfa/fwl/BUILD.gn
index 58a3b3c..ae42174 100644
--- a/xfa/fwl/BUILD.gn
+++ b/xfa/fwl/BUILD.gn
@@ -113,7 +113,7 @@
"../../fxjs:gc",
"../fde",
"../fgas",
- "../fxgraphics",
+ "../fgas/graphics",
]
configs += [
"../../:pdfium_core_config",
diff --git a/xfa/fwl/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp
index 923e5c9..8a4cbfb 100644
--- a/xfa/fwl/cfwl_barcode.cpp
+++ b/xfa/fwl/cfwl_barcode.cpp
@@ -30,7 +30,7 @@
GenerateBarcodeImageCache();
}
-void CFWL_Barcode::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_Barcode::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
diff --git a/xfa/fwl/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h
index 0af87fd..31aca8e 100644
--- a/xfa/fwl/cfwl_barcode.h
+++ b/xfa/fwl/cfwl_barcode.h
@@ -37,7 +37,8 @@
// CFWL_Widget
FWL_Type GetClassID() const override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
// CFWL_Edit
diff --git a/xfa/fwl/cfwl_caret.cpp b/xfa/fwl/cfwl_caret.cpp
index 589046a..8503872 100644
--- a/xfa/fwl/cfwl_caret.cpp
+++ b/xfa/fwl/cfwl_caret.cpp
@@ -37,7 +37,7 @@
void CFWL_Caret::Update() {}
-void CFWL_Caret::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_Caret::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -57,7 +57,7 @@
SetStates(FWL_WGTSTATE_Invisible);
}
-void CFWL_Caret::DrawCaretBK(CXFA_Graphics* pGraphics,
+void CFWL_Caret::DrawCaretBK(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
if (!(m_Properties.m_dwStates & kStateHighlight))
return;
@@ -76,7 +76,7 @@
void CFWL_Caret::OnProcessMessage(CFWL_Message* pMessage) {}
-void CFWL_Caret::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_Caret::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_caret.h b/xfa/fwl/cfwl_caret.h
index a4dac04..b59637e 100644
--- a/xfa/fwl/cfwl_caret.h
+++ b/xfa/fwl/cfwl_caret.h
@@ -10,8 +10,8 @@
#include <memory>
#include "core/fxcrt/cfx_timer.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
class CFWL_Caret final : public CFWL_Widget, public CFX_Timer::CallbackIface {
public:
@@ -20,9 +20,10 @@
// CFWL_Widget:
FWL_Type GetClassID() const override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
void Update() override;
@@ -35,7 +36,7 @@
private:
CFWL_Caret(CFWL_App* app, const Properties& properties, CFWL_Widget* pOuter);
- void DrawCaretBK(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawCaretBK(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
std::unique_ptr<CFX_Timer> m_pTimer;
};
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
index bb7dc57..01160b6 100644
--- a/xfa/fwl/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -50,7 +50,7 @@
Layout();
}
-void CFWL_CheckBox::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_CheckBox::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -227,7 +227,7 @@
CFWL_Widget::OnProcessMessage(pMessage);
}
-void CFWL_CheckBox::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_CheckBox::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h
index 46f4bfe..6a17a09 100644
--- a/xfa/fwl/cfwl_checkbox.h
+++ b/xfa/fwl/cfwl_checkbox.h
@@ -36,10 +36,11 @@
// CFWL_Widget
FWL_Type GetClassID() const override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
void SetBoxSize(float fHeight);
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
index 1145fd6..8ef8fd8 100644
--- a/xfa/fwl/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -101,7 +101,7 @@
return FWL_WidgetHit::Unknown;
}
-void CFWL_ComboBox::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ComboBox::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
pGraphics->SaveGraphState();
pGraphics->ConcatMatrix(&matrix);
@@ -448,7 +448,7 @@
}
}
-void CFWL_ComboBox::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ComboBox::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h
index a849d1c..4b4ac7e 100644
--- a/xfa/fwl/cfwl_combobox.h
+++ b/xfa/fwl/cfwl_combobox.h
@@ -7,11 +7,11 @@
#ifndef XFA_FWL_CFWL_COMBOBOX_H_
#define XFA_FWL_CFWL_COMBOBOX_H_
+#include "xfa/fgas/graphics/cfgas_gegraphics.h"
#include "xfa/fwl/cfwl_comboedit.h"
#include "xfa/fwl/cfwl_combolist.h"
#include "xfa/fwl/cfwl_listbox.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_graphics.h"
class CFWL_ComboBox;
class CFWL_ListBox;
@@ -46,10 +46,11 @@
void RemoveStates(uint32_t dwStates) override;
void Update() override;
FWL_WidgetHit HitTest(const CFX_PointF& point) override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
WideString GetTextByIndex(int32_t iIndex) const;
diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index 243d692..03b50ca 100644
--- a/xfa/fwl/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -92,7 +92,7 @@
return FWL_WidgetHit::Unknown;
}
-void CFWL_DateTimePicker::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_DateTimePicker::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -179,7 +179,7 @@
m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
-void CFWL_DateTimePicker::DrawDropDownButton(CXFA_Graphics* pGraphics,
+void CFWL_DateTimePicker::DrawDropDownButton(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
param.m_pWidget = this;
@@ -347,7 +347,7 @@
CFWL_Widget::OnProcessMessage(pMessage);
}
-void CFWL_DateTimePicker::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_DateTimePicker::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_datetimepicker.h b/xfa/fwl/cfwl_datetimepicker.h
index 50a40ed..5a3f6c4 100644
--- a/xfa/fwl/cfwl_datetimepicker.h
+++ b/xfa/fwl/cfwl_datetimepicker.h
@@ -39,9 +39,10 @@
FWL_Type GetClassID() const override;
void Update() override;
FWL_WidgetHit HitTest(const CFX_PointF& point) override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
void GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay);
@@ -78,7 +79,8 @@
private:
explicit CFWL_DateTimePicker(CFWL_App* pApp);
- void DrawDropDownButton(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawDropDownButton(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix* pMatrix);
WideString FormatDateString(int32_t iYear, int32_t iMonth, int32_t iDay);
void ResetEditAlignment();
void GetPopupPos(float fMinHeight,
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index c4aacc9..696be7e 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -19,6 +19,7 @@
#include "v8/include/cppgc/visitor.h"
#include "xfa/fde/cfde_textout.h"
#include "xfa/fgas/font/cfgas_gefont.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_app.h"
#include "xfa/fwl/cfwl_caret.h"
#include "xfa/fwl/cfwl_event.h"
@@ -32,7 +33,6 @@
#include "xfa/fwl/fwl_widgetdef.h"
#include "xfa/fwl/ifwl_themeprovider.h"
#include "xfa/fwl/theme/cfwl_utils.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
namespace {
@@ -140,7 +140,8 @@
return FWL_WidgetHit::Unknown;
}
-void CFWL_Edit::DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) {
+void CFWL_Edit::DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -321,7 +322,7 @@
m_fScrollOffsetY = fScrollOffset;
}
-void CFWL_Edit::DrawTextBk(CXFA_Graphics* pGraphics,
+void CFWL_Edit::DrawTextBk(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
param.m_pWidget = this;
@@ -352,7 +353,7 @@
GetThemeProvider()->DrawBackground(param);
}
-void CFWL_Edit::DrawContent(CXFA_Graphics* pGraphics,
+void CFWL_Edit::DrawContent(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
pGraphics->SaveGraphState();
if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_CombText)
@@ -376,7 +377,7 @@
std::vector<CFX_RectF> rects =
m_pEditEngine->GetCharacterRectsInRange(sel_start, count);
- CXFA_GEPath path;
+ CFGAS_GEPath path;
for (auto& rect : rects) {
rect.left += fOffSetX;
rect.top += fOffSetY;
@@ -399,7 +400,7 @@
if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_CombText) {
pGraphics->RestoreGraphState();
- CXFA_GEPath path;
+ CFGAS_GEPath path;
int32_t iLimit = m_nLimit > 0 ? m_nLimit : 1;
float fStep = m_EngineRect.width / iLimit;
float fLeft = m_EngineRect.left + 1;
@@ -1028,7 +1029,7 @@
}
}
-void CFWL_Edit::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_Edit::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h
index e123a0f..f6f6fec 100644
--- a/xfa/fwl/cfwl_edit.h
+++ b/xfa/fwl/cfwl_edit.h
@@ -11,10 +11,10 @@
#include <utility>
#include "xfa/fde/cfde_texteditengine.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_event.h"
#include "xfa/fwl/cfwl_scrollbar.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
#define FWL_STYLEEXT_EDT_ReadOnly (1L << 0)
#define FWL_STYLEEXT_EDT_MultiLine (1L << 1)
@@ -56,10 +56,11 @@
void Update() override;
FWL_WidgetHit HitTest(const CFX_PointF& point) override;
void SetStates(uint32_t dwStates) override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
virtual void SetText(const WideString& wsText);
@@ -107,10 +108,8 @@
void RenderText(CFX_RenderDevice* pRenderDev,
const CFX_RectF& clipRect,
const CFX_Matrix& mt);
- void DrawTextBk(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawContent(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
+ void DrawTextBk(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawContent(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
void UpdateEditEngine();
void UpdateEditParams();
diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index b4eaac2..fdb3536 100644
--- a/xfa/fwl/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -83,7 +83,7 @@
return FWL_WidgetHit::Unknown;
}
-void CFWL_ListBox::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ListBox::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -327,7 +327,7 @@
return true;
}
-void CFWL_ListBox::DrawBkground(CXFA_Graphics* pGraphics,
+void CFWL_ListBox::DrawBkground(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
if (!pGraphics)
return;
@@ -346,7 +346,7 @@
GetThemeProvider()->DrawBackground(param);
}
-void CFWL_ListBox::DrawItems(CXFA_Graphics* pGraphics,
+void CFWL_ListBox::DrawItems(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
float fPosX = 0.0f;
if (m_pHorzScrollBar)
@@ -378,7 +378,7 @@
}
}
-void CFWL_ListBox::DrawItem(CXFA_Graphics* pGraphics,
+void CFWL_ListBox::DrawItem(CFGAS_GEGraphics* pGraphics,
Item* pItem,
int32_t Index,
const CFX_RectF& rtItem,
@@ -669,7 +669,7 @@
}
}
-void CFWL_ListBox::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ListBox::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h
index 1443246..79b5732 100644
--- a/xfa/fwl/cfwl_listbox.h
+++ b/xfa/fwl/cfwl_listbox.h
@@ -56,10 +56,11 @@
FWL_Type GetClassID() const override;
void Update() override;
FWL_WidgetHit HitTest(const CFX_PointF& point) override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
int32_t CountItems(const CFWL_Widget* pWidget) const;
@@ -99,14 +100,14 @@
void SelectAll();
Item* GetFocusedItem();
void SetFocusItem(Item* hItem);
- void DrawBkground(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix);
- void DrawItems(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix);
- void DrawItem(CXFA_Graphics* pGraphics,
+ void DrawBkground(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawItems(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawItem(CFGAS_GEGraphics* pGraphics,
Item* hItem,
int32_t Index,
const CFX_RectF& rtItem,
const CFX_Matrix* pMatrix);
- void DrawStatic(CXFA_Graphics* pGraphics);
+ void DrawStatic(CFGAS_GEGraphics* pGraphics);
CFX_SizeF CalcSize(bool bAutoSize);
void UpdateItemSize(Item* hItem,
CFX_SizeF& size,
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index eb780de..61f4992 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -118,7 +118,7 @@
Layout();
}
-void CFWL_MonthCalendar::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -147,7 +147,7 @@
AddSelDay(iDay);
}
-void CFWL_MonthCalendar::DrawBackground(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawBackground(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -160,7 +160,7 @@
GetThemeProvider()->DrawBackground(params);
}
-void CFWL_MonthCalendar::DrawHeadBK(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawHeadBK(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -173,7 +173,7 @@
GetThemeProvider()->DrawBackground(params);
}
-void CFWL_MonthCalendar::DrawLButton(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawLButton(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -186,7 +186,7 @@
GetThemeProvider()->DrawBackground(params);
}
-void CFWL_MonthCalendar::DrawRButton(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawRButton(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -199,7 +199,7 @@
GetThemeProvider()->DrawBackground(params);
}
-void CFWL_MonthCalendar::DrawCaption(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawCaption(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeText textParam;
textParam.m_pWidget = this;
@@ -217,7 +217,7 @@
GetThemeProvider()->DrawText(textParam);
}
-void CFWL_MonthCalendar::DrawSeparator(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawSeparator(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -230,7 +230,7 @@
GetThemeProvider()->DrawBackground(params);
}
-void CFWL_MonthCalendar::DrawDatesInBK(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesInBK(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground params;
params.m_pWidget = this;
@@ -260,7 +260,7 @@
}
}
-void CFWL_MonthCalendar::DrawWeek(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawWeek(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeText params;
params.m_pWidget = this;
@@ -286,7 +286,7 @@
}
}
-void CFWL_MonthCalendar::DrawToday(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawToday(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeText params;
params.m_pWidget = this;
@@ -304,7 +304,7 @@
GetThemeProvider()->DrawText(params);
}
-void CFWL_MonthCalendar::DrawDatesIn(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesIn(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeText params;
params.m_pWidget = this;
@@ -330,7 +330,7 @@
}
}
-void CFWL_MonthCalendar::DrawDatesOut(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesOut(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeText params;
params.m_pWidget = this;
@@ -343,7 +343,7 @@
GetThemeProvider()->DrawText(params);
}
-void CFWL_MonthCalendar::DrawDatesInCircle(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::DrawDatesInCircle(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
if (m_iMonth != m_iCurMonth || m_iYear != m_iCurYear)
return;
@@ -681,7 +681,7 @@
CFWL_Widget::OnProcessMessage(pMessage);
}
-void CFWL_MonthCalendar::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_MonthCalendar::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_monthcalendar.h b/xfa/fwl/cfwl_monthcalendar.h
index b23217d..c044511 100644
--- a/xfa/fwl/cfwl_monthcalendar.h
+++ b/xfa/fwl/cfwl_monthcalendar.h
@@ -28,9 +28,10 @@
FWL_Type GetClassID() const override;
CFX_RectF GetAutosizedWidgetRect() override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
void SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay);
@@ -89,29 +90,18 @@
const Properties& properties,
CFWL_Widget* pOuter);
- void DrawBackground(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawHeadBK(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawLButton(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawRButton(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawCaption(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawSeparator(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawDatesInBK(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawWeek(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawToday(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawDatesIn(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawDatesOut(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
- void DrawDatesInCircle(CXFA_Graphics* pGraphics,
+ void DrawBackground(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawHeadBK(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawLButton(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawRButton(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawCaption(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawSeparator(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawDatesInBK(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawWeek(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawToday(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawDatesIn(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawDatesOut(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawDatesInCircle(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix);
CFX_SizeF CalcSize();
void Layout();
diff --git a/xfa/fwl/cfwl_notedriver.h b/xfa/fwl/cfwl_notedriver.h
index 2fe2360..91ba765 100644
--- a/xfa/fwl/cfwl_notedriver.h
+++ b/xfa/fwl/cfwl_notedriver.h
@@ -15,8 +15,8 @@
#include "v8/include/cppgc/garbage-collected.h"
#include "v8/include/cppgc/member.h"
#include "v8/include/cppgc/visitor.h"
+#include "xfa/fgas/graphics/cfgas_gegraphics.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_graphics.h"
class CFWL_Event;
diff --git a/xfa/fwl/cfwl_picturebox.cpp b/xfa/fwl/cfwl_picturebox.cpp
index 9532ceb..de4e2ba 100644
--- a/xfa/fwl/cfwl_picturebox.cpp
+++ b/xfa/fwl/cfwl_picturebox.cpp
@@ -22,7 +22,7 @@
m_ClientRect = GetClientRect();
}
-void CFWL_PictureBox::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_PictureBox::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -31,7 +31,7 @@
DrawBorder(pGraphics, CFWL_Part::Border, matrix);
}
-void CFWL_PictureBox::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_PictureBox::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_picturebox.h b/xfa/fwl/cfwl_picturebox.h
index 43f1c7a..68cebef 100644
--- a/xfa/fwl/cfwl_picturebox.h
+++ b/xfa/fwl/cfwl_picturebox.h
@@ -20,8 +20,9 @@
// CFWL_Widget
FWL_Type GetClassID() const override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
private:
diff --git a/xfa/fwl/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp
index 4a82cc0..7f8e6e4 100644
--- a/xfa/fwl/cfwl_pushbutton.cpp
+++ b/xfa/fwl/cfwl_pushbutton.cpp
@@ -42,7 +42,7 @@
m_CaptionRect = m_ClientRect;
}
-void CFWL_PushButton::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_PushButton::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -53,7 +53,7 @@
DrawBkground(pGraphics, &matrix);
}
-void CFWL_PushButton::DrawBkground(CXFA_Graphics* pGraphics,
+void CFWL_PushButton::DrawBkground(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
param.m_pWidget = this;
@@ -126,7 +126,7 @@
CFWL_Widget::OnProcessMessage(pMessage);
}
-void CFWL_PushButton::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_PushButton::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_pushbutton.h b/xfa/fwl/cfwl_pushbutton.h
index 07de454..823096c 100644
--- a/xfa/fwl/cfwl_pushbutton.h
+++ b/xfa/fwl/cfwl_pushbutton.h
@@ -25,16 +25,16 @@
FWL_Type GetClassID() const override;
void SetStates(uint32_t dwStates) override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
private:
explicit CFWL_PushButton(CFWL_App* pApp);
- void DrawBkground(CXFA_Graphics* pGraphics,
- const CFX_Matrix* pMatrix);
+ void DrawBkground(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
uint32_t GetPartStates();
void UpdateTextOutStyles();
void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index 5bfb988..e564331 100644
--- a/xfa/fwl/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -45,7 +45,7 @@
Layout();
}
-void CFWL_ScrollBar::DrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
@@ -73,7 +73,7 @@
return OnScroll(dwCode, fPos);
}
-void CFWL_ScrollBar::DrawTrack(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawTrack(CFGAS_GEGraphics* pGraphics,
bool bLower,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
@@ -88,7 +88,7 @@
GetThemeProvider()->DrawBackground(param);
}
-void CFWL_ScrollBar::DrawArrowBtn(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawArrowBtn(CFGAS_GEGraphics* pGraphics,
bool bMinBtn,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
@@ -104,7 +104,7 @@
GetThemeProvider()->DrawBackground(param);
}
-void CFWL_ScrollBar::DrawThumb(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBar::DrawThumb(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
param.m_pWidget = this;
@@ -318,7 +318,7 @@
}
}
-void CFWL_ScrollBar::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBar::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
DrawWidget(pGraphics, matrix);
}
diff --git a/xfa/fwl/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h
index 04cdba8..31fb4c9 100644
--- a/xfa/fwl/cfwl_scrollbar.h
+++ b/xfa/fwl/cfwl_scrollbar.h
@@ -27,9 +27,10 @@
// CFWL_Widget:
FWL_Type GetClassID() const override;
void Update() override;
- void DrawWidget(CXFA_Graphics* pGraphics, const CFX_Matrix& matrix) override;
+ void DrawWidget(CFGAS_GEGraphics* pGraphics,
+ const CFX_Matrix& matrix) override;
void OnProcessMessage(CFWL_Message* pMessage) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
// CFX_Timer::CallbackIface:
@@ -61,13 +62,13 @@
bool IsVertical() const {
return !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_SCB_Vert);
}
- void DrawTrack(CXFA_Graphics* pGraphics,
+ void DrawTrack(CFGAS_GEGraphics* pGraphics,
bool bLower,
const CFX_Matrix* pMatrix);
- void DrawArrowBtn(CXFA_Graphics* pGraphics,
+ void DrawArrowBtn(CFGAS_GEGraphics* pGraphics,
bool bMinBtn,
const CFX_Matrix* pMatrix);
- void DrawThumb(CXFA_Graphics* pGraphics, const CFX_Matrix* pMatrix);
+ void DrawThumb(CFGAS_GEGraphics* pGraphics, const CFX_Matrix* pMatrix);
void Layout();
void CalcButtonLen();
CFX_RectF CalcMinButtonRect();
diff --git a/xfa/fwl/cfwl_themebackground.h b/xfa/fwl/cfwl_themebackground.h
index 46df73c..fd09ca2 100644
--- a/xfa/fwl/cfwl_themebackground.h
+++ b/xfa/fwl/cfwl_themebackground.h
@@ -10,16 +10,16 @@
#include "core/fxcrt/unowned_ptr.h"
#include "xfa/fwl/cfwl_themepart.h"
-class CXFA_Graphics;
-class CXFA_GEPath;
+class CFGAS_GEGraphics;
+class CFGAS_GEPath;
class CFWL_ThemeBackground final : public CFWL_ThemePart {
public:
CFWL_ThemeBackground();
~CFWL_ThemeBackground();
- UnownedPtr<CXFA_Graphics> m_pGraphics;
- UnownedPtr<CXFA_GEPath> m_pPath;
+ UnownedPtr<CFGAS_GEGraphics> m_pGraphics;
+ UnownedPtr<CFGAS_GEPath> m_pPath;
};
inline CFWL_ThemeBackground::CFWL_ThemeBackground() = default;
diff --git a/xfa/fwl/cfwl_themetext.h b/xfa/fwl/cfwl_themetext.h
index f0cfaa7..cb1b770 100644
--- a/xfa/fwl/cfwl_themetext.h
+++ b/xfa/fwl/cfwl_themetext.h
@@ -16,7 +16,7 @@
CFWL_ThemeText() = default;
FDE_TextAlignment m_iTTOAlign = FDE_TextAlignment::kTopLeft;
- CXFA_Graphics* m_pGraphics = nullptr;
+ CFGAS_GEGraphics* m_pGraphics = nullptr;
WideString m_wsText;
FDE_TextStyle m_dwTTOStyles;
};
diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp
index 0401501..0f3ee5c 100644
--- a/xfa/fwl/cfwl_widget.cpp
+++ b/xfa/fwl/cfwl_widget.cpp
@@ -280,7 +280,7 @@
m_pWidgetMgr->RepaintWidget(this, pRect);
}
-void CFWL_Widget::DrawBackground(CXFA_Graphics* pGraphics,
+void CFWL_Widget::DrawBackground(CFGAS_GEGraphics* pGraphics,
CFWL_Part iPartBk,
const CFX_Matrix* pMatrix) {
CFWL_ThemeBackground param;
@@ -293,7 +293,7 @@
GetThemeProvider()->DrawBackground(param);
}
-void CFWL_Widget::DrawBorder(CXFA_Graphics* pGraphics,
+void CFWL_Widget::DrawBorder(CFGAS_GEGraphics* pGraphics,
CFWL_Part iPartBorder,
const CFX_Matrix& matrix) {
CFWL_ThemeBackground param;
@@ -355,7 +355,7 @@
void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {}
-void CFWL_Widget::OnDrawWidget(CXFA_Graphics* pGraphics,
+void CFWL_Widget::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {}
CFWL_Widget::ScopedUpdateLock::ScopedUpdateLock(CFWL_Widget* widget)
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index aeef2dc..2d30bc6 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -99,13 +99,13 @@
virtual void RemoveStates(uint32_t dwStates);
virtual void Update() = 0;
virtual FWL_WidgetHit HitTest(const CFX_PointF& point);
- virtual void DrawWidget(CXFA_Graphics* pGraphics,
+ virtual void DrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) = 0;
// IFWL_WidgetDelegate:
void OnProcessMessage(CFWL_Message* pMessage) override;
void OnProcessEvent(CFWL_Event* pEvent) override;
- void OnDrawWidget(CXFA_Graphics* pGraphics,
+ void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) override;
void InflateWidgetRect(CFX_RectF& rect);
@@ -163,7 +163,7 @@
void RegisterEventTarget(CFWL_Widget* pEventSource);
void UnregisterEventTarget();
void DispatchEvent(CFWL_Event* pEvent);
- void DrawBorder(CXFA_Graphics* pGraphics,
+ void DrawBorder(CFGAS_GEGraphics* pGraphics,
CFWL_Part iPartBorder,
const CFX_Matrix& pMatrix);
@@ -179,7 +179,7 @@
CFWL_Widget* GetParent() const { return m_pWidgetMgr->GetParentWidget(this); }
CFX_SizeF GetOffsetFromParent(CFWL_Widget* pParent);
- void DrawBackground(CXFA_Graphics* pGraphics,
+ void DrawBackground(CFGAS_GEGraphics* pGraphics,
CFWL_Part iPartBk,
const CFX_Matrix* pMatrix);
void NotifyDriver();
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index d290346..5014192 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -190,7 +190,7 @@
}
void CFWL_WidgetMgr::OnDrawWidget(CFWL_Widget* pWidget,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
if (!pWidget || !pGraphics)
return;
@@ -204,7 +204,7 @@
void CFWL_WidgetMgr::DrawChildren(CFWL_Widget* parent,
const CFX_RectF& rtClip,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix) {
if (!parent)
return;
diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h
index 34867ba..a3a8982 100644
--- a/xfa/fwl/cfwl_widgetmgr.h
+++ b/xfa/fwl/cfwl_widgetmgr.h
@@ -16,13 +16,13 @@
#include "v8/include/cppgc/garbage-collected.h"
#include "v8/include/cppgc/member.h"
#include "v8/include/cppgc/visitor.h"
-#include "xfa/fxgraphics/cxfa_graphics.h"
+#include "xfa/fgas/graphics/cfgas_gegraphics.h"
-class CFWL_Message;
-class CXFA_Graphics;
-class CFX_Matrix;
+class CFGAS_GEGraphics;
class CFWL_App;
+class CFWL_Message;
class CFWL_Widget;
+class CFX_Matrix;
class CFWL_WidgetMgr final : public cppgc::GarbageCollected<CFWL_WidgetMgr> {
public:
@@ -44,7 +44,7 @@
void OnProcessMessageToForm(CFWL_Message* pMessage);
void OnDrawWidget(CFWL_Widget* pWidget,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix);
CFWL_Widget* GetParentWidget(const CFWL_Widget* pWidget) const;
@@ -92,7 +92,7 @@
void DrawChildren(CFWL_Widget* pParent,
const CFX_RectF& rtClip,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_Matrix* pMatrix);
cppgc::Member<AdapterIface> const m_pAdapter;
diff --git a/xfa/fwl/ifwl_widgetdelegate.h b/xfa/fwl/ifwl_widgetdelegate.h
index d6403c9..ba659d2 100644
--- a/xfa/fwl/ifwl_widgetdelegate.h
+++ b/xfa/fwl/ifwl_widgetdelegate.h
@@ -9,9 +9,9 @@
#include "v8/include/cppgc/garbage-collected.h"
+class CFGAS_GEGraphics;
class CFWL_Event;
class CFWL_Message;
-class CXFA_Graphics;
class CFX_Matrix;
class IFWL_WidgetDelegate : public cppgc::GarbageCollectedMixin {
@@ -20,7 +20,7 @@
virtual void OnProcessMessage(CFWL_Message* pMessage) = 0;
virtual void OnProcessEvent(CFWL_Event* pEvent) = 0;
- virtual void OnDrawWidget(CXFA_Graphics* pGraphics,
+ virtual void OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) = 0;
};
diff --git a/xfa/fwl/theme/cfwl_carettp.cpp b/xfa/fwl/theme/cfwl_carettp.cpp
index bd7db65..5c4d99b 100644
--- a/xfa/fwl/theme/cfwl_carettp.cpp
+++ b/xfa/fwl/theme/cfwl_carettp.cpp
@@ -6,11 +6,11 @@
#include "xfa/fwl/theme/cfwl_carettp.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_caret.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
CFWL_CaretTP::CFWL_CaretTP() = default;
@@ -31,13 +31,13 @@
}
}
-void CFWL_CaretTP::DrawCaretBK(CXFA_Graphics* pGraphics,
+void CFWL_CaretTP::DrawCaretBK(CFGAS_GEGraphics* pGraphics,
uint32_t dwStates,
const CFX_RectF& rect,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
- pGraphics->SetFillColor(CXFA_GEColor(ArgbEncode(255, 0, 0, 0)));
+ pGraphics->SetFillColor(CFGAS_GEColor(ArgbEncode(255, 0, 0, 0)));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
}
diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h
index 36075c6..071a0be 100644
--- a/xfa/fwl/theme/cfwl_carettp.h
+++ b/xfa/fwl/theme/cfwl_carettp.h
@@ -21,7 +21,7 @@
private:
CFWL_CaretTP();
- void DrawCaretBK(CXFA_Graphics* pGraphics,
+ void DrawCaretBK(CFGAS_GEGraphics* pGraphics,
uint32_t dwStates,
const CFX_RectF& rect,
const CFX_Matrix& matrix);
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp
index 301f47f..ee4dfca 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -9,12 +9,12 @@
#include "core/fxge/cfx_pathdata.h"
#include "third_party/base/stl_util.h"
#include "xfa/fde/cfde_textout.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_checkbox.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_themetext.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
namespace {
@@ -41,7 +41,7 @@
CFWL_WidgetTP::DrawText(pParams);
}
-void CFWL_CheckBoxTP::DrawSignCheck(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignCheck(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
@@ -52,30 +52,30 @@
mt.Translate(rtSign.left, rtSign.top);
mt.Concat(matrix);
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(argbFill));
+ pGraphics->SetFillColor(CFGAS_GEColor(argbFill));
pGraphics->FillPath(m_pCheckPath.get(),
CFX_FillRenderOptions::FillType::kWinding, &mt);
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::DrawSignCircle(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignCircle(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddEllipse(rtSign);
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(argbFill));
+ pGraphics->SetFillColor(CFGAS_GEColor(argbFill));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::DrawSignCross(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignCross(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
float fRight = rtSign.right();
float fBottom = rtSign.bottom();
path.AddLine(rtSign.TopLeft(), CFX_PointF(fRight, fBottom));
@@ -83,17 +83,17 @@
CFX_PointF(fRight, rtSign.top));
pGraphics->SaveGraphState();
- pGraphics->SetStrokeColor(CXFA_GEColor(argbFill));
+ pGraphics->SetStrokeColor(CFGAS_GEColor(argbFill));
pGraphics->SetLineWidth(1.0f);
pGraphics->StrokePath(&path, &matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::DrawSignDiamond(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignDiamond(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
float fWidth = rtSign.width;
float fHeight = rtSign.height;
float fBottom = rtSign.bottom();
@@ -104,30 +104,30 @@
path.LineTo(CFX_PointF(rtSign.left + fWidth / 2, rtSign.top));
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(argbFill));
+ pGraphics->SetFillColor(CFGAS_GEColor(argbFill));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::DrawSignSquare(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignSquare(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rtSign.left, rtSign.top, rtSign.width, rtSign.height);
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(argbFill));
+ pGraphics->SetFillColor(CFGAS_GEColor(argbFill));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_CheckBoxTP::DrawSignStar(CXFA_Graphics* pGraphics,
+void CFWL_CheckBoxTP::DrawSignStar(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
float fBottom = rtSign.bottom();
float fRadius = (rtSign.top - fBottom) / (1 + cosf(FX_PI / 5.0f));
CFX_PointF ptCenter((rtSign.left + rtSign.right()) / 2.0f,
@@ -148,7 +148,7 @@
path.LineTo(points[next]);
}
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(argbFill));
+ pGraphics->SetFillColor(CFGAS_GEColor(argbFill));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
pGraphics->RestoreGraphState();
@@ -156,7 +156,7 @@
void CFWL_CheckBoxTP::InitCheckPath(float fCheckLen) {
if (!m_pCheckPath) {
- m_pCheckPath = std::make_unique<CXFA_GEPath>();
+ m_pCheckPath = std::make_unique<CFGAS_GEPath>();
float fWidth = kSignPath;
float fHeight = -kSignPath;
@@ -220,7 +220,7 @@
}
void CFWL_CheckBoxTP::DrawCheckSign(CFWL_Widget* pWidget,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_RectF& pRtBox,
int32_t iState,
const CFX_Matrix& matrix) {
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h
index 5d472be..d3727b1 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.h
+++ b/xfa/fwl/theme/cfwl_checkboxtp.h
@@ -12,8 +12,8 @@
#include "fxjs/gc/heap.h"
#include "xfa/fwl/theme/cfwl_widgettp.h"
+class CFGAS_GEPath;
class CFWL_Widget;
-class CXFA_GEPath;
class CFWL_CheckBoxTP final : public CFWL_WidgetTP {
public:
@@ -28,38 +28,38 @@
CFWL_CheckBoxTP();
void DrawCheckSign(CFWL_Widget* pWidget,
- CXFA_Graphics* pGraphics,
+ CFGAS_GEGraphics* pGraphics,
const CFX_RectF& pRtBox,
int32_t iState,
const CFX_Matrix& matrix);
- void DrawSignCheck(CXFA_Graphics* pGraphics,
+ void DrawSignCheck(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
- void DrawSignCircle(CXFA_Graphics* pGraphics,
+ void DrawSignCircle(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
- void DrawSignCross(CXFA_Graphics* pGraphics,
+ void DrawSignCross(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
- void DrawSignDiamond(CXFA_Graphics* pGraphics,
+ void DrawSignDiamond(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
- void DrawSignSquare(CXFA_Graphics* pGraphics,
+ void DrawSignSquare(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
- void DrawSignStar(CXFA_Graphics* pGraphics,
+ void DrawSignStar(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rtSign,
FX_ARGB argbFill,
const CFX_Matrix& matrix);
void InitCheckPath(float fCheckLen);
- std::unique_ptr<CXFA_GEPath> m_pCheckPath;
+ std::unique_ptr<CFGAS_GEPath> m_pCheckPath;
};
#endif // XFA_FWL_THEME_CFWL_CHECKBOXTP_H_
diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp
index 1805130..662027a 100644
--- a/xfa/fwl/theme/cfwl_comboboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp
@@ -6,12 +6,12 @@
#include "xfa/fwl/theme/cfwl_comboboxtp.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_combobox.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
#include "xfa/fwl/ifwl_themeprovider.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
CFWL_ComboBoxTP::CFWL_ComboBoxTP() = default;
@@ -25,7 +25,7 @@
break;
}
case CFWL_Part::Background: {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
const CFX_RectF& rect = pParams.m_PartRect;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
FX_ARGB argb_color;
@@ -40,7 +40,7 @@
argb_color = 0xFFFFFFFF;
}
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetFillColor(CXFA_GEColor(argb_color));
+ pParams.m_pGraphics->SetFillColor(CFGAS_GEColor(argb_color));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &pParams.m_matrix);
pParams.m_pGraphics->RestoreGraphState();
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp
index ca37dff..d808a13 100644
--- a/xfa/fwl/theme/cfwl_edittp.cpp
+++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -6,11 +6,11 @@
#include "xfa/fwl/theme/cfwl_edittp.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_edit.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
CFWL_EditTP::CFWL_EditTP() = default;
@@ -23,7 +23,7 @@
FX_ARGB cr = 0xFF000000;
float fWidth = 1.0f;
pWidget->GetBorderColorAndThickness(&cr, &fWidth);
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(cr));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(cr));
pParams.m_pGraphics->SetLineWidth(fWidth);
pParams.m_pGraphics->StrokePath(pParams.m_pPath.Get(), &pParams.m_matrix);
return;
@@ -37,25 +37,25 @@
}
case CFWL_Part::Background: {
if (pParams.m_pPath) {
- CXFA_Graphics* pGraphics = pParams.m_pGraphics.Get();
+ CFGAS_GEGraphics* pGraphics = pParams.m_pGraphics.Get();
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(FWLTHEME_COLOR_BKSelected));
+ pGraphics->SetFillColor(CFGAS_GEColor(FWLTHEME_COLOR_BKSelected));
pGraphics->FillPath(pParams.m_pPath.Get(),
CFX_FillRenderOptions::FillType::kWinding,
&pParams.m_matrix);
pGraphics->RestoreGraphState();
} else {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(pParams.m_PartRect.left, pParams.m_PartRect.top,
pParams.m_PartRect.width, pParams.m_PartRect.height);
- CXFA_GEColor cr(FWLTHEME_COLOR_Background);
+ CFGAS_GEColor cr(FWLTHEME_COLOR_Background);
if (!pParams.m_bStaticBackground) {
if (pParams.m_dwStates & CFWL_PartState_Disabled)
- cr = CXFA_GEColor(FWLTHEME_COLOR_EDGERB1);
+ cr = CFGAS_GEColor(FWLTHEME_COLOR_EDGERB1);
else if (pParams.m_dwStates & CFWL_PartState_ReadOnly)
- cr = CXFA_GEColor(ArgbEncode(255, 236, 233, 216));
+ cr = CFGAS_GEColor(ArgbEncode(255, 236, 233, 216));
else
- cr = CXFA_GEColor(0xFFFFFFFF);
+ cr = CFGAS_GEColor(0xFFFFFFFF);
}
pParams.m_pGraphics->SaveGraphState();
pParams.m_pGraphics->SetFillColor(cr);
@@ -67,7 +67,7 @@
break;
}
case CFWL_Part::CombTextLine: {
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(0xFF000000));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(0xFF000000));
pParams.m_pGraphics->SetLineWidth(1.0f);
pParams.m_pGraphics->StrokePath(pParams.m_pPath.Get(), &pParams.m_matrix);
break;
diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp
index 290d06f..a5737c5 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_listboxtp.cpp
@@ -7,11 +7,11 @@
#include "xfa/fwl/theme/cfwl_listboxtp.h"
#include "build/build_config.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_listbox.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
CFWL_ListBoxTP::CFWL_ListBoxTP() = default;
@@ -54,15 +54,15 @@
}
}
-void CFWL_ListBoxTP::DrawListBoxItem(CXFA_Graphics* pGraphics,
+void CFWL_ListBoxTP::DrawListBoxItem(CFGAS_GEGraphics* pGraphics,
uint32_t dwStates,
const CFX_RectF& rtItem,
const CFX_RectF* pData,
const CFX_Matrix& matrix) {
if (dwStates & CFWL_PartState_Selected) {
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(FWLTHEME_COLOR_BKSelected));
- CXFA_GEPath path;
+ pGraphics->SetFillColor(CFGAS_GEColor(FWLTHEME_COLOR_BKSelected));
+ CFGAS_GEPath path;
#if defined(OS_APPLE)
path.AddRectangle(rtItem.left, rtItem.top, rtItem.width - 1,
rtItem.height - 1);
diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h
index 0af98cd..5f5a5bb 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.h
+++ b/xfa/fwl/theme/cfwl_listboxtp.h
@@ -21,7 +21,7 @@
private:
CFWL_ListBoxTP();
- void DrawListBoxItem(CXFA_Graphics* pGraphics,
+ void DrawListBoxItem(CFGAS_GEGraphics* pGraphics,
uint32_t dwStates,
const CFX_RectF& rtItem,
const CFX_RectF* pData,
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
index 0f4e874..aeb2c75 100644
--- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
@@ -7,13 +7,13 @@
#include "xfa/fwl/theme/cfwl_monthcalendartp.h"
#include "xfa/fde/cfde_textout.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_monthcalendar.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_themetext.h"
#include "xfa/fwl/cfwl_widget.h"
#include "xfa/fwl/ifwl_themeprovider.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
namespace {
@@ -100,11 +100,11 @@
void CFWL_MonthCalendarTP::DrawTotalBK(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtTotal(pParams.m_PartRect);
path.AddRectangle(rtTotal.left, rtTotal.top, rtTotal.width, rtTotal.height);
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetFillColor(CXFA_GEColor(kBackgroundColor));
+ pParams.m_pGraphics->SetFillColor(CFGAS_GEColor(kBackgroundColor));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
pParams.m_pGraphics->RestoreGraphState();
@@ -112,11 +112,11 @@
void CFWL_MonthCalendarTP::DrawHeadBk(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtHead = pParams.m_PartRect;
path.AddRectangle(rtHead.left, rtHead.top, rtHead.width, rtHead.height);
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetFillColor(CXFA_GEColor(kBackgroundColor));
+ pParams.m_pGraphics->SetFillColor(CFGAS_GEColor(kBackgroundColor));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
pParams.m_pGraphics->RestoreGraphState();
@@ -124,21 +124,21 @@
void CFWL_MonthCalendarTP::DrawLButton(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtLBtn = pParams.m_PartRect;
path.AddRectangle(rtLBtn.left, rtLBtn.top, rtLBtn.width, rtLBtn.height);
pParams.m_pGraphics->SaveGraphState();
pParams.m_pGraphics->SetStrokeColor(
- CXFA_GEColor(ArgbEncode(0xff, 205, 219, 243)));
+ CFGAS_GEColor(ArgbEncode(0xff, 205, 219, 243)));
pParams.m_pGraphics->StrokePath(&path, &matrix);
if (pParams.m_dwStates & CFWL_PartState_Pressed) {
pParams.m_pGraphics->SetFillColor(
- CXFA_GEColor(ArgbEncode(0xff, 174, 198, 242)));
+ CFGAS_GEColor(ArgbEncode(0xff, 174, 198, 242)));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
} else {
pParams.m_pGraphics->SetFillColor(
- CXFA_GEColor(ArgbEncode(0xff, 227, 235, 249)));
+ CFGAS_GEColor(ArgbEncode(0xff, 227, 235, 249)));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
}
@@ -152,28 +152,28 @@
rtLBtn.bottom() - rtLBtn.height / 4));
pParams.m_pGraphics->SetStrokeColor(
- CXFA_GEColor(ArgbEncode(0xff, 50, 104, 205)));
+ CFGAS_GEColor(ArgbEncode(0xff, 50, 104, 205)));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
void CFWL_MonthCalendarTP::DrawRButton(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtRBtn = pParams.m_PartRect;
path.AddRectangle(rtRBtn.left, rtRBtn.top, rtRBtn.width, rtRBtn.height);
pParams.m_pGraphics->SaveGraphState();
pParams.m_pGraphics->SetStrokeColor(
- CXFA_GEColor(ArgbEncode(0xff, 205, 219, 243)));
+ CFGAS_GEColor(ArgbEncode(0xff, 205, 219, 243)));
pParams.m_pGraphics->StrokePath(&path, &matrix);
if (pParams.m_dwStates & CFWL_PartState_Pressed) {
pParams.m_pGraphics->SetFillColor(
- CXFA_GEColor(ArgbEncode(0xff, 174, 198, 242)));
+ CFGAS_GEColor(ArgbEncode(0xff, 174, 198, 242)));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
} else {
pParams.m_pGraphics->SetFillColor(
- CXFA_GEColor(ArgbEncode(0xff, 227, 235, 249)));
+ CFGAS_GEColor(ArgbEncode(0xff, 227, 235, 249)));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
}
@@ -187,31 +187,31 @@
rtRBtn.bottom() - rtRBtn.height / 4));
pParams.m_pGraphics->SetStrokeColor(
- CXFA_GEColor(ArgbEncode(0xff, 50, 104, 205)));
+ CFGAS_GEColor(ArgbEncode(0xff, 50, 104, 205)));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
void CFWL_MonthCalendarTP::DrawHSeparator(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtHSep = pParams.m_PartRect;
path.MoveTo(CFX_PointF(rtHSep.left, rtHSep.top + rtHSep.height / 2));
path.LineTo(CFX_PointF(rtHSep.right(), rtHSep.top + rtHSep.height / 2));
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(kSeparatorColor));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(kSeparatorColor));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
void CFWL_MonthCalendarTP::DrawWeekNumSep(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtWeekSep = pParams.m_PartRect;
path.MoveTo(rtWeekSep.TopLeft());
path.LineTo(rtWeekSep.BottomLeft());
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(kSeparatorColor));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(kSeparatorColor));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
@@ -220,20 +220,21 @@
const CFX_Matrix& matrix) {
pParams.m_pGraphics->SaveGraphState();
if (pParams.m_dwStates & CFWL_PartState_Selected) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtSelDay = pParams.m_PartRect;
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width,
rtSelDay.height);
pParams.m_pGraphics->SetFillColor(
- CXFA_GEColor(kDatesSelectedBackgroundColor));
+ CFGAS_GEColor(kDatesSelectedBackgroundColor));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
} else if (pParams.m_dwStates & CFWL_PartState_Hovered) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtSelDay = pParams.m_PartRect;
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width,
rtSelDay.height);
- pParams.m_pGraphics->SetFillColor(CXFA_GEColor(kDatesHoverBackgroundColor));
+ pParams.m_pGraphics->SetFillColor(
+ CFGAS_GEColor(kDatesHoverBackgroundColor));
pParams.m_pGraphics->FillPath(
&path, CFX_FillRenderOptions::FillType::kWinding, &matrix);
}
@@ -243,24 +244,24 @@
void CFWL_MonthCalendarTP::DrawDatesInCircle(
const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtSelDay = pParams.m_PartRect;
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width,
rtSelDay.height);
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(kDatesCircleColor));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(kDatesCircleColor));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
void CFWL_MonthCalendarTP::DrawTodayCircle(const CFWL_ThemeBackground& pParams,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
CFX_RectF rtTodayCircle = pParams.m_PartRect;
path.AddRectangle(rtTodayCircle.left, rtTodayCircle.top, rtTodayCircle.width,
rtTodayCircle.height);
pParams.m_pGraphics->SaveGraphState();
- pParams.m_pGraphics->SetStrokeColor(CXFA_GEColor(kDatesCircleColor));
+ pParams.m_pGraphics->SetStrokeColor(CFGAS_GEColor(kDatesCircleColor));
pParams.m_pGraphics->StrokePath(&path, &matrix);
pParams.m_pGraphics->RestoreGraphState();
}
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.cpp b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
index 491727e..fdbbdab 100644
--- a/xfa/fwl/theme/cfwl_pushbuttontp.cpp
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.cpp
@@ -6,12 +6,12 @@
#include "xfa/fwl/theme/cfwl_pushbuttontp.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_pushbutton.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
#include "xfa/fwl/ifwl_themeprovider.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
#define PUSHBUTTON_SIZE_Corner 2
@@ -33,7 +33,7 @@
float fRight = rect.right();
float fBottom = rect.bottom();
- CXFA_GEPath strokePath;
+ CFGAS_GEPath strokePath;
strokePath.MoveTo(
CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top));
strokePath.LineTo(CFX_PointF(fRight - PUSHBUTTON_SIZE_Corner, rect.top));
@@ -49,10 +49,10 @@
strokePath.LineTo(
CFX_PointF(rect.left + PUSHBUTTON_SIZE_Corner, rect.top));
- CXFA_GEPath fillPath;
+ CFGAS_GEPath fillPath;
fillPath.AddSubpath(&strokePath);
- CXFA_Graphics* pGraphics = pParams.m_pGraphics.Get();
+ CFGAS_GEGraphics* pGraphics = pParams.m_pGraphics.Get();
pGraphics->SaveGraphState();
CFX_RectF rtInner(rect);
@@ -65,14 +65,14 @@
FillSolidRect(pGraphics, m_pThemeData->clrEnd[iColor], rect,
pParams.m_matrix);
- pGraphics->SetStrokeColor(CXFA_GEColor(m_pThemeData->clrBorder[iColor]));
+ pGraphics->SetStrokeColor(CFGAS_GEColor(m_pThemeData->clrBorder[iColor]));
pGraphics->StrokePath(&strokePath, &pParams.m_matrix);
fillPath.Clear();
fillPath.AddRectangle(rtInner.left, rtInner.top, rtInner.width,
rtInner.height);
- pGraphics->SetFillColor(CXFA_GEColor(m_pThemeData->clrFill[iColor]));
+ pGraphics->SetFillColor(CFGAS_GEColor(m_pThemeData->clrFill[iColor]));
pGraphics->FillPath(&fillPath, CFX_FillRenderOptions::FillType::kWinding,
&pParams.m_matrix);
if (pParams.m_dwStates & CFWL_PartState_Focused) {
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp
index 630ead8..b56935e 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -6,12 +6,12 @@
#include "xfa/fwl/theme/cfwl_scrollbartp.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_scrollbar.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_widget.h"
#include "xfa/fwl/ifwl_themeprovider.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
namespace {
@@ -35,7 +35,7 @@
else if (pParams.m_dwStates & CFWL_PartState_Disabled)
eState = FWLTHEME_STATE_Disable;
- CXFA_Graphics* pGraphics = pParams.m_pGraphics.Get();
+ CFGAS_GEGraphics* pGraphics = pParams.m_pGraphics.Get();
bool bVert = !!pWidget->GetStylesEx();
switch (pParams.m_iPart) {
case CFWL_Part::ForeArrow: {
@@ -70,7 +70,7 @@
}
}
-void CFWL_ScrollBarTP::DrawThumbBtn(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBarTP::DrawThumbBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& input_rect,
bool bVert,
FWLTHEME_STATE eState,
@@ -92,20 +92,20 @@
pGraphics->SaveGraphState();
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
pGraphics->SetStrokeColor(
- CXFA_GEColor(m_pThemeData->clrBtnBorder[eState - 1]));
+ CFGAS_GEColor(m_pThemeData->clrBtnBorder[eState - 1]));
pGraphics->StrokePath(&path, &matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_ScrollBarTP::DrawPaw(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBarTP::DrawPaw(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
bool bVert,
FWLTHEME_STATE eState,
const CFX_Matrix& matrix) {
- CXFA_GEPath path;
+ CFGAS_GEPath path;
if (bVert) {
float fPawLen = kPawLength;
if (rect.width / 2 <= fPawLen) {
@@ -125,7 +125,7 @@
pGraphics->SetLineWidth(1);
pGraphics->SetStrokeColor(
- CXFA_GEColor(m_pThemeData->clrPawColorLight[eState - 1]));
+ CFGAS_GEColor(m_pThemeData->clrPawColorLight[eState - 1]));
pGraphics->StrokePath(&path, nullptr);
fX++;
@@ -141,7 +141,7 @@
pGraphics->SetLineWidth(1);
pGraphics->SetStrokeColor(
- CXFA_GEColor(m_pThemeData->clrPawColorDark[eState - 1]));
+ CFGAS_GEColor(m_pThemeData->clrPawColorDark[eState - 1]));
pGraphics->StrokePath(&path, &matrix);
} else {
float fPawLen = kPawLength;
@@ -162,7 +162,7 @@
pGraphics->SetLineWidth(1);
pGraphics->SetStrokeColor(
- CXFA_GEColor(m_pThemeData->clrPawColorLight[eState - 1]));
+ CFGAS_GEColor(m_pThemeData->clrPawColorLight[eState - 1]));
pGraphics->StrokePath(&path, &matrix);
fY++;
@@ -178,12 +178,12 @@
pGraphics->SetLineWidth(1);
pGraphics->SetStrokeColor(
- CXFA_GEColor(m_pThemeData->clrPawColorDark[eState - 1]));
+ CFGAS_GEColor(m_pThemeData->clrPawColorDark[eState - 1]));
pGraphics->StrokePath(&path, &matrix);
}
}
-void CFWL_ScrollBarTP::DrawTrack(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBarTP::DrawTrack(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
bool bVert,
FWLTHEME_STATE eState,
@@ -193,7 +193,7 @@
return;
pGraphics->SaveGraphState();
- CXFA_GEPath path;
+ CFGAS_GEPath path;
float fRight = rect.right();
float fBottom = rect.bottom();
if (bVert) {
@@ -203,7 +203,7 @@
path.AddRectangle(rect.left, rect.top, rect.width, 1);
path.AddRectangle(rect.left, fBottom - 1, rect.width, 1);
}
- pGraphics->SetFillColor(CXFA_GEColor(ArgbEncode(255, 238, 237, 229)));
+ pGraphics->SetFillColor(CFGAS_GEColor(ArgbEncode(255, 238, 237, 229)));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
path.Clear();
@@ -212,7 +212,7 @@
FillSolidRect(pGraphics, m_pThemeData->clrTrackBKEnd, rect, matrix);
}
-void CFWL_ScrollBarTP::DrawMaxMinBtn(CXFA_Graphics* pGraphics,
+void CFWL_ScrollBarTP::DrawMaxMinBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 61de1b8..2ddd136 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -32,24 +32,24 @@
CFWL_ScrollBarTP();
- void DrawThumbBtn(CXFA_Graphics* pGraphics,
+ void DrawThumbBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
bool bVert,
FWLTHEME_STATE eState,
bool bPawButton,
const CFX_Matrix& matrix);
- void DrawTrack(CXFA_Graphics* pGraphics,
+ void DrawTrack(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
bool bVert,
FWLTHEME_STATE eState,
bool bLowerTrack,
const CFX_Matrix& matrix);
- void DrawMaxMinBtn(CXFA_Graphics* pGraphics,
+ void DrawMaxMinBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
const CFX_Matrix& matrix);
- void DrawPaw(CXFA_Graphics* pGraphics,
+ void DrawPaw(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
bool bVert,
FWLTHEME_STATE eState,
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index 8878a2d..a6cdf1e 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -11,6 +11,8 @@
#include "xfa/fde/cfde_textout.h"
#include "xfa/fgas/font/cfgas_gefont.h"
+#include "xfa/fgas/graphics/cfgas_gecolor.h"
+#include "xfa/fgas/graphics/cfgas_gepath.h"
#include "xfa/fwl/cfwl_themebackground.h"
#include "xfa/fwl/cfwl_themepart.h"
#include "xfa/fwl/cfwl_themetext.h"
@@ -18,8 +20,6 @@
#include "xfa/fwl/cfwl_widgetmgr.h"
#include "xfa/fwl/ifwl_themeprovider.h"
#include "xfa/fwl/theme/cfwl_fontmanager.h"
-#include "xfa/fxgraphics/cxfa_gecolor.h"
-#include "xfa/fxgraphics/cxfa_gepath.h"
CFWL_WidgetTP::CFWL_WidgetTP() = default;
@@ -35,7 +35,7 @@
if (iLen <= 0)
return;
- CXFA_Graphics* pGraphics = pParams.m_pGraphics;
+ CFGAS_GEGraphics* pGraphics = pParams.m_pGraphics;
m_pTextOut->SetStyles(pParams.m_dwTTOStyles);
m_pTextOut->SetAlignment(pParams.m_iTTOAlign);
@@ -85,62 +85,62 @@
m_pTextOut->SetTextColor(FWLTHEME_CAPACITY_TextColor);
}
-void CFWL_WidgetTP::DrawBorder(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::DrawBorder(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
path.AddRectangle(rect.left + 1, rect.top + 1, rect.width - 2,
rect.height - 2);
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(ArgbEncode(255, 0, 0, 0)));
+ pGraphics->SetFillColor(CFGAS_GEColor(ArgbEncode(255, 0, 0, 0)));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kEvenOdd,
&matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_WidgetTP::FillBackground(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::FillBackground(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix) {
FillSolidRect(pGraphics, FWLTHEME_COLOR_Background, rect, matrix);
}
-void CFWL_WidgetTP::FillSolidRect(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::FillSolidRect(CFGAS_GEGraphics* pGraphics,
FX_ARGB fillColor,
const CFX_RectF& rect,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
pGraphics->SaveGraphState();
- pGraphics->SetFillColor(CXFA_GEColor(fillColor));
+ pGraphics->SetFillColor(CFGAS_GEColor(fillColor));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_WidgetTP::DrawFocus(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::DrawFocus(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix) {
if (!pGraphics)
return;
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
pGraphics->SaveGraphState();
- pGraphics->SetStrokeColor(CXFA_GEColor(0xFF000000));
+ pGraphics->SetStrokeColor(CFGAS_GEColor(0xFF000000));
static constexpr float kDashPattern[2] = {1, 1};
pGraphics->SetLineDash(0.0f, kDashPattern);
pGraphics->StrokePath(&path, &matrix);
pGraphics->RestoreGraphState();
}
-void CFWL_WidgetTP::DrawArrow(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::DrawArrow(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argSign,
@@ -149,7 +149,7 @@
(eDict == FWLTHEME_DIRECTION_Up || eDict == FWLTHEME_DIRECTION_Down);
float fLeft = ((rect.width - (bVert ? 9 : 6)) / 2 + rect.left) + 0.5f;
float fTop = ((rect.height - (bVert ? 6 : 9)) / 2 + rect.top) + 0.5f;
- CXFA_GEPath path;
+ CFGAS_GEPath path;
switch (eDict) {
case FWLTHEME_DIRECTION_Down: {
path.MoveTo(CFX_PointF(fLeft, fTop + 1));
@@ -188,25 +188,25 @@
break;
}
}
- pGraphics->SetFillColor(CXFA_GEColor(argSign));
+ pGraphics->SetFillColor(CFGAS_GEColor(argSign));
pGraphics->FillPath(&path, CFX_FillRenderOptions::FillType::kWinding,
&matrix);
}
-void CFWL_WidgetTP::DrawBtn(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::DrawBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_STATE eState,
const CFX_Matrix& matrix) {
InitializeArrowColorData();
FillSolidRect(pGraphics, m_pColorData->clrEnd[eState - 1], rect, matrix);
- CXFA_GEPath path;
+ CFGAS_GEPath path;
path.AddRectangle(rect.left, rect.top, rect.width, rect.height);
- pGraphics->SetStrokeColor(CXFA_GEColor(m_pColorData->clrBorder[eState - 1]));
+ pGraphics->SetStrokeColor(CFGAS_GEColor(m_pColorData->clrBorder[eState - 1]));
pGraphics->StrokePath(&path, &matrix);
}
-void CFWL_WidgetTP::DrawArrowBtn(CXFA_Graphics* pGraphics,
+void CFWL_WidgetTP::DrawArrowBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index a545589..a5c035c 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -18,9 +18,9 @@
class CFDE_TextOut;
class CFGAS_GEFont;
+class CFGAS_GEGraphics;
class CFWL_ThemeBackground;
class CFWL_ThemeText;
-class CXFA_Graphics;
class CFWL_WidgetTP : public cppgc::GarbageCollected<CFWL_WidgetTP> {
public:
@@ -47,29 +47,29 @@
void InitializeArrowColorData();
void EnsureTTOInitialized();
- void DrawBorder(CXFA_Graphics* pGraphics,
+ void DrawBorder(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix);
- void FillBackground(CXFA_Graphics* pGraphics,
+ void FillBackground(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix);
- void FillSolidRect(CXFA_Graphics* pGraphics,
+ void FillSolidRect(CFGAS_GEGraphics* pGraphics,
FX_ARGB fillColor,
const CFX_RectF& rect,
const CFX_Matrix& matrix);
- void DrawFocus(CXFA_Graphics* pGraphics,
+ void DrawFocus(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
const CFX_Matrix& matrix);
- void DrawArrow(CXFA_Graphics* pGraphics,
+ void DrawArrow(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argSign,
const CFX_Matrix& matrix);
- void DrawBtn(CXFA_Graphics* pGraphics,
+ void DrawBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_STATE eState,
const CFX_Matrix& matrix);
- void DrawArrowBtn(CXFA_Graphics* pGraphics,
+ void DrawArrowBtn(CFGAS_GEGraphics* pGraphics,
const CFX_RectF& rect,
FWLTHEME_DIRECTION eDict,
FWLTHEME_STATE eState,
