From 33c8c7602f8981c32d37a9b2e25496401e914391 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Dec 2015 12:29:58 -0800 Subject: Replace more static casts in FWL (part 3) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1508883003 . --- xfa/include/fwl/core/fwl_widgetmgr.h | 1 - xfa/include/fxgraphics/fx_graphics.h | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h index c191cae0c2..b4d03e0ca4 100644 --- a/xfa/include/fwl/core/fwl_widgetmgr.h +++ b/xfa/include/fwl/core/fwl_widgetmgr.h @@ -30,7 +30,6 @@ class IFWL_WidgetMgr { FWL_WGTRELATION eRelation) = 0; virtual int32_t GetWidgetIndex(IFWL_Widget* pWidget) = 0; virtual FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) = 0; - virtual FX_BOOL IsWidget(void* pObj) = 0; virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect = NULL) = 0; virtual FX_DWORD GetCapability() = 0; diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h index fb18dcebe9..4131f45f86 100644 --- a/xfa/include/fxgraphics/fx_graphics.h +++ b/xfa/include/fxgraphics/fx_graphics.h @@ -212,7 +212,7 @@ class CFX_Graphics { const CFX_RectF& rect, CFX_Matrix* matrix = NULL); - FX_ERR ConcatMatrix(CFX_Matrix* matrix); + FX_ERR ConcatMatrix(const CFX_Matrix* matrix); CFX_Matrix* GetMatrix(); @@ -241,13 +241,12 @@ class CFX_Graphics { FX_BOOL isMultiline = FALSE, CFX_Matrix* matrix = NULL); - FX_ERR Transfer(CFX_Graphics* graphics, CFX_Matrix* matrix = NULL); - + FX_ERR Transfer(CFX_Graphics* graphics, const CFX_Matrix* matrix); FX_ERR Transfer(CFX_Graphics* graphics, FX_FLOAT srcLeft, FX_FLOAT srcTop, const CFX_RectF& dstRect, - CFX_Matrix* matrix = NULL); + const CFX_Matrix* matrix); CFX_RenderDevice* GetRenderDevice(); -- cgit v1.2.3