summaryrefslogtreecommitdiff
path: root/fpdfsdk/include
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-06 23:00:34 -0800
committerLei Zhang <thestig@chromium.org>2016-01-06 23:00:34 -0800
commit7457e38fae636ce3d0cda2c7fd2e100975440222 (patch)
tree1b710980f6befe610cc013f2d914c8a9ba49eab3 /fpdfsdk/include
parent20e25f2d6cbe4e9955a6e7c445749d5492548d76 (diff)
downloadpdfium-7457e38fae636ce3d0cda2c7fd2e100975440222.tar.xz
Merge to XFA: Return const-ref object in a few CPWL_Wnd getters.
Also remove a bunch of dead code. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1565803003 . (cherry picked from commit cbed99098ad4cdc3f9f260cc1e8521f67c12d35d) Review URL: https://codereview.chromium.org/1569483004 .
Diffstat (limited to 'fpdfsdk/include')
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Utils.h1
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h13
2 files changed, 3 insertions, 11 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 56f7a27350..ef87ea36f4 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -220,7 +220,6 @@ class CPWL_Utils {
const CPWL_Color& crLeftTop,
const CPWL_Color& crRightBottom,
int32_t nStyle,
- const CPWL_Dash& dash,
int32_t nTransparancy);
static void DrawFillArea(CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 0ea48b570d..4f59fc3d92 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -294,7 +294,6 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void Move(const CPDF_Rect& rcNew, FX_BOOL bReset, FX_BOOL bRefresh);
virtual void InvalidateRect(CPDF_Rect* pRect = NULL);
- void GetAppearanceStream(CFX_ByteString& sAppStream);
void DrawAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device);
virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag);
@@ -341,27 +340,21 @@ class CPWL_Wnd : public CPWL_TimerHandler {
virtual void SetFontSize(FX_FLOAT fFontSize);
void SetBackgroundColor(const CPWL_Color& color);
- void SetBorderColor(const CPWL_Color& color);
- void SetBorderWidth(int32_t nBorderWidth);
void SetClipRect(const CPDF_Rect& rect);
void SetBorderStyle(int32_t eBorderStyle);
- void SetBorderDash(const CPWL_Dash& sDash);
- CPDF_Rect GetOriginWindowRect() const;
virtual CPDF_Rect GetWindowRect() const;
virtual CPDF_Rect GetClientRect() const;
CPDF_Point GetCenterPoint() const;
- CPDF_Rect GetClientCenterSquare() const;
- CPDF_Rect GetWindowCenterSquare() const;
int32_t GetBorderWidth() const;
FX_BOOL IsVisible() const { return m_bVisible; }
FX_BOOL HasFlag(FX_DWORD dwFlags) const;
void AddFlag(FX_DWORD dwFlags);
void RemoveFlag(FX_DWORD dwFlags);
- CPDF_Rect GetClipRect() const;
+ const CPDF_Rect& GetClipRect() const;
CPWL_Wnd* GetParentWindow() const;
int32_t GetBorderStyle() const;
- CPWL_Dash GetBorderDash() const;
+ const CPWL_Dash& GetBorderDash() const;
void* GetAttachedData() const;
FX_BOOL WndHitTest(const CPDF_Point& point) const;
@@ -427,7 +420,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void SetNotifyFlag(FX_BOOL bNotifying = TRUE) { m_bNotifying = bNotifying; }
FX_BOOL IsValid() const;
- PWL_CREATEPARAM GetCreationParam() const;
+ const PWL_CREATEPARAM& GetCreationParam() const;
FX_BOOL IsNotifying() const { return m_bNotifying; }
void InvalidateRectMove(const CPDF_Rect& rcOld, const CPDF_Rect& rcNew);