Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: fpdfsdk/include/fsdk_annothandler.h

Issue 1313733013: Remove IPDFSDK_AnnotHandler interface. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: De-crapify Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | fpdfsdk/src/fsdk_annothandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: fpdfsdk/include/fsdk_annothandler.h
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 369a080a9b2f2134a349c6f50af04158bf9cc085..47f2bd1b0f5f5399a0a6409f620f6e0dc24842c2 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -21,188 +21,86 @@ class CPDF_Matrix;
class CPDF_Point;
class CPDF_Rect;
-class IPDFSDK_AnnotHandler {
+class CPDFSDK_AnnotHandler {
public:
- virtual ~IPDFSDK_AnnotHandler() {}
-
- virtual CFX_ByteString GetType() = 0;
-
- virtual CFX_ByteString GetName() = 0;
-
- virtual FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot,
- CPDFSDK_PageView* pPage) = 0;
-
- virtual void ReleaseAnnot(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual void DeleteAnnot(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual CPDF_Rect GetViewBBox(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot) = 0;
-
- virtual FX_BOOL HitTest(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- const CPDF_Point& point) = 0;
-
- virtual void OnDraw(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
- FX_DWORD dwFlags) = 0;
-
- virtual void OnDrawSleep(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- CFX_RenderDevice* pDevice,
- CPDF_Matrix* pUser2Device,
- const CPDF_Rect& rcWindow,
- FX_DWORD dwFlags) = 0;
-
- virtual void OnCreate(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual void OnLoad(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual void OnDelete(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual void OnRelease(CPDFSDK_Annot* pAnnot) = 0;
+ CPDFSDK_AnnotHandler(CPDFDoc_Environment* pApp)
Lei Zhang 2015/09/01 21:33:30 explicit
Tom Sepez 2015/09/01 22:05:30 Done.
+ : m_pApp(pApp), m_pFormFiller(NULL) {}
Lei Zhang 2015/09/01 21:33:30 nullptr
Tom Sepez 2015/09/01 22:05:30 Done.
- virtual void OnMouseEnter(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlag) = 0;
- virtual void OnMouseExit(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlag) = 0;
-
- virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- short zDelta,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- virtual FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlags,
- const CPDF_Point& point) = 0;
- // by wjm.
- virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot,
- FX_DWORD nChar,
- FX_DWORD nFlags) = 0;
- virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) = 0;
- virtual FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) = 0;
-
- virtual void OnDeSelected(CPDFSDK_Annot* pAnnot) = 0;
- virtual void OnSelected(CPDFSDK_Annot* pAnnot) = 0;
-
- virtual FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) = 0;
- virtual FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) = 0;
-};
+ ~CPDFSDK_AnnotHandler() {}
-class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler {
- public:
- CPDFSDK_BFAnnotHandler(CPDFDoc_Environment* pApp)
- : m_pApp(pApp), m_pFormFiller(NULL) {}
- ~CPDFSDK_BFAnnotHandler() override {}
-
- // IPDFSDK_AnnotHandler
- CFX_ByteString GetType() override { return CFX_ByteString("Widget"); }
- CFX_ByteString GetName() override { return CFX_ByteString("WidgetHandler"); }
- FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot) override;
- CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage) override;
- void ReleaseAnnot(CPDFSDK_Annot* pAnnot) override;
- void DeleteAnnot(CPDFSDK_Annot* pAnnot) override {}
- CPDF_Rect GetViewBBox(CPDFSDK_PageView* pPageView,
- CPDFSDK_Annot* pAnnot) override;
+ CFX_ByteString GetType() { return CFX_ByteString("Widget"); }
+ CFX_ByteString GetName() { return CFX_ByteString("WidgetHandler"); }
+ FX_BOOL CanAnswer(CPDFSDK_Annot* pAnnot);
+ CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage);
+ void ReleaseAnnot(CPDFSDK_Annot* pAnnot);
+ void DeleteAnnot(CPDFSDK_Annot* pAnnot) {}
+ CPDF_Rect GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot);
FX_BOOL HitTest(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
void OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CPDF_Matrix* pUser2Device,
- FX_DWORD dwFlags) override;
+ FX_DWORD dwFlags);
void OnDrawSleep(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CPDF_Matrix* pUser2Device,
const CPDF_Rect& rcWindow,
- FX_DWORD dwFlags) override {}
- void OnCreate(CPDFSDK_Annot* pAnnot) override;
- void OnLoad(CPDFSDK_Annot* pAnnot) override;
- void OnDelete(CPDFSDK_Annot* pAnnot) override {}
- void OnRelease(CPDFSDK_Annot* pAnnot) override {}
+ FX_DWORD dwFlags) {}
+ void OnCreate(CPDFSDK_Annot* pAnnot);
+ void OnLoad(CPDFSDK_Annot* pAnnot);
+ void OnDelete(CPDFSDK_Annot* pAnnot) {}
+ void OnRelease(CPDFSDK_Annot* pAnnot) {}
void OnMouseEnter(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlag) override;
+ FX_DWORD nFlag);
void OnMouseExit(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
- FX_DWORD nFlag) override;
+ FX_DWORD nFlag);
FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
short zDelta,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override;
+ const CPDF_Point& point);
FX_BOOL OnRButtonDblClk(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
FX_DWORD nFlags,
- const CPDF_Point& point) override {
+ const CPDF_Point& point) {
return FALSE;
}
- FX_BOOL OnChar(CPDFSDK_Annot* pAnnot,
- FX_DWORD nChar,
- FX_DWORD nFlags) override;
- FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
- FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag) override;
- void OnDeSelected(CPDFSDK_Annot* pAnnot) override {}
- void OnSelected(CPDFSDK_Annot* pAnnot) override {}
- FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) override;
- FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag) override;
+ FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_DWORD nChar, FX_DWORD nFlags);
+ FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag);
+ FX_BOOL OnKeyUp(CPDFSDK_Annot* pAnnot, int nKeyCode, int nFlag);
+ void OnDeSelected(CPDFSDK_Annot* pAnnot) {}
+ void OnSelected(CPDFSDK_Annot* pAnnot) {}
+ FX_BOOL OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag);
+ FX_BOOL OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag);
void SetFormFiller(CFFL_IFormFiller* pFiller) { m_pFormFiller = pFiller; }
CFFL_IFormFiller* GetFormFiller() { return m_pFormFiller; }
@@ -212,16 +110,16 @@ class CPDFSDK_BFAnnotHandler : public IPDFSDK_AnnotHandler {
CFFL_IFormFiller* m_pFormFiller;
};
-#define CBA_AnnotHandlerArray CFX_ArrayTemplate<IPDFSDK_AnnotHandler*>
+using CBA_AnnotHandlerArray = CFX_ArrayTemplate<CPDFSDK_AnnotHandler*>;
+
class CPDFSDK_AnnotHandlerMgr {
public:
// Destroy the handler
explicit CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp);
virtual ~CPDFSDK_AnnotHandlerMgr();
- public:
- void RegisterAnnotHandler(IPDFSDK_AnnotHandler* pAnnotHandler);
- void UnRegisterAnnotHandler(IPDFSDK_AnnotHandler* pAnnotHandler);
+ void RegisterAnnotHandler(CPDFSDK_AnnotHandler* pAnnotHandler);
+ void UnRegisterAnnotHandler(CPDFSDK_AnnotHandler* pAnnotHandler);
virtual CPDFSDK_Annot* NewAnnot(CPDF_Annot* pAnnot,
CPDFSDK_PageView* pPageView);
@@ -230,8 +128,7 @@ class CPDFSDK_AnnotHandlerMgr {
virtual void Annot_OnCreate(CPDFSDK_Annot* pAnnot);
virtual void Annot_OnLoad(CPDFSDK_Annot* pAnnot);
- public:
- IPDFSDK_AnnotHandler* GetAnnotHandler(CPDFSDK_Annot* pAnnot) const;
+ CPDFSDK_AnnotHandler* GetAnnotHandler(CPDFSDK_Annot* pAnnot) const;
virtual void Annot_OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
@@ -294,12 +191,11 @@ class CPDFSDK_AnnotHandlerMgr {
const CPDF_Point& point);
private:
- IPDFSDK_AnnotHandler* GetAnnotHandler(const CFX_ByteString& sType) const;
+ CPDFSDK_AnnotHandler* GetAnnotHandler(const CFX_ByteString& sType) const;
CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pSDKAnnot, FX_BOOL bNext);
- private:
CBA_AnnotHandlerArray m_Handlers;
- std::map<CFX_ByteString, IPDFSDK_AnnotHandler*> m_mapType2Handler;
+ std::map<CFX_ByteString, CPDFSDK_AnnotHandler*> m_mapType2Handler;
CPDFDoc_Environment* m_pApp;
};
« no previous file with comments | « no previous file | fpdfsdk/src/fsdk_annothandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698