| Index: xfa/fde/fde_render.cpp
|
| diff --git a/xfa/fde/fde_render.cpp b/xfa/fde/fde_render.cpp
|
| index 17bf20afbd219bf2697e1a50626b6be77f56c67b..93d75927d692a6c4806963357fdd6545dc00cdfb 100644
|
| --- a/xfa/fde/fde_render.cpp
|
| +++ b/xfa/fde/fde_render.cpp
|
| @@ -25,7 +25,6 @@ class CFDE_RenderContext : public IFDE_RenderContext, public CFX_Target {
|
| virtual FDE_RENDERSTATUS GetStatus() const { return m_eStatus; }
|
| virtual FDE_RENDERSTATUS DoRender(IFX_Pause* pPause = NULL);
|
| virtual void StopRender();
|
| - void RenderPath(IFDE_PathSet* pPathSet, FDE_HVISUALOBJ hPath);
|
| void RenderText(IFDE_TextSet* pTextSet, FDE_HVISUALOBJ hText);
|
| FX_BOOL ApplyClip(IFDE_VisualSet* pVisualSet,
|
| FDE_HVISUALOBJ hObj,
|
| @@ -167,13 +166,6 @@ FDE_RENDERSTATUS CFDE_RenderContext::DoRender(IFX_Pause* pPause) {
|
| RenderText((IFDE_TextSet*)pVisualSet, hVisualObj);
|
| iCount += 5;
|
| break;
|
| - case FDE_VISUALOBJ_Path:
|
| - RenderPath((IFDE_PathSet*)pVisualSet, hVisualObj);
|
| - iCount += 20;
|
| - break;
|
| - case FDE_VISUALOBJ_Widget:
|
| - iCount += 10;
|
| - break;
|
| case FDE_VISUALOBJ_Canvas:
|
| FXSYS_assert(FALSE);
|
| break;
|
| @@ -241,34 +233,7 @@ void CFDE_RenderContext::RenderText(IFDE_TextSet* pTextSet,
|
| RestoreClip(hState);
|
| }
|
| }
|
| -void CFDE_RenderContext::RenderPath(IFDE_PathSet* pPathSet,
|
| - FDE_HVISUALOBJ hPath) {
|
| - FXSYS_assert(m_pRenderDevice != NULL);
|
| - FXSYS_assert(pPathSet != NULL && hPath != NULL);
|
| - IFDE_Path* pPath = pPathSet->GetPath(hPath);
|
| - if (pPath == NULL) {
|
| - return;
|
| - }
|
| - FDE_HDEVICESTATE hState;
|
| - FX_BOOL bClip = ApplyClip(pPathSet, hPath, hState);
|
| - int32_t iRenderMode = pPathSet->GetRenderMode(hPath);
|
| - if (iRenderMode & FDE_PATHRENDER_Stroke) {
|
| - IFDE_Pen* pPen = pPathSet->GetPen(hPath);
|
| - FX_FLOAT fWidth = pPathSet->GetPenWidth(hPath);
|
| - if (pPen != NULL && fWidth > 0) {
|
| - m_pRenderDevice->DrawPath(pPen, fWidth, pPath, &m_Transform);
|
| - }
|
| - }
|
| - if (iRenderMode & FDE_PATHRENDER_Fill) {
|
| - IFDE_Brush* pBrush = pPathSet->GetBrush(hPath);
|
| - if (pBrush != NULL) {
|
| - m_pRenderDevice->FillPath(pBrush, pPath, &m_Transform);
|
| - }
|
| - }
|
| - if (bClip) {
|
| - RestoreClip(hState);
|
| - }
|
| -}
|
| +
|
| FX_BOOL CFDE_RenderContext::ApplyClip(IFDE_VisualSet* pVisualSet,
|
| FDE_HVISUALOBJ hObj,
|
| FDE_HDEVICESTATE& hState) {
|
|
|