summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2018-01-25 16:34:28 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-25 16:34:28 +0000
commitb9ec0b31a9324a4927ab897c4f741de836321832 (patch)
treed07cd46f1dda88423a198d5a7d42413887bc458f
parent5a21af6cf90ccb2eb18823130e16666a76d9ecba (diff)
downloadpdfium-b9ec0b31a9324a4927ab897c4f741de836321832.tar.xz
Remove draw from creatable widgetschromium/3333
The Draw element is one of the two cases where we will determine an actual widget type. This CL removes the FFDraw from the widgets which can be created directly. Change-Id: I74d53b736d73cf0d88c6177b4e1d14e73497bf60 Reviewed-on: https://pdfium-review.googlesource.com/23970 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
-rw-r--r--xfa/fxfa/cxfa_ffdraw.h4
-rw-r--r--xfa/fxfa/cxfa_ffnotify.cpp4
2 files changed, 3 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffdraw.h b/xfa/fxfa/cxfa_ffdraw.h
index de9cfcf428..697359766f 100644
--- a/xfa/fxfa/cxfa_ffdraw.h
+++ b/xfa/fxfa/cxfa_ffdraw.h
@@ -12,8 +12,10 @@
class CXFA_FFDraw : public CXFA_FFWidget {
public:
- explicit CXFA_FFDraw(CXFA_Node* pNode);
~CXFA_FFDraw() override;
+
+ protected:
+ explicit CXFA_FFDraw(CXFA_Node* pNode);
};
#endif // XFA_FXFA_CXFA_FFDRAW_H_
diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp
index 3fd06a18be..009458912a 100644
--- a/xfa/fxfa/cxfa_ffnotify.cpp
+++ b/xfa/fxfa/cxfa_ffnotify.cpp
@@ -17,7 +17,6 @@
#include "xfa/fxfa/cxfa_ffdatetimeedit.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
#include "xfa/fxfa/cxfa_ffdocview.h"
-#include "xfa/fxfa/cxfa_ffdraw.h"
#include "xfa/fxfa/cxfa_ffexclgroup.h"
#include "xfa/fxfa/cxfa_fffield.h"
#include "xfa/fxfa/cxfa_ffimage.h"
@@ -168,9 +167,6 @@ CXFA_ContentLayoutItem* CXFA_FFNotify::OnCreateContentLayoutItem(
case XFA_Element::Image:
pWidget = new CXFA_FFImage(pNode);
break;
- case XFA_Element::Draw:
- pWidget = new CXFA_FFDraw(pNode);
- break;
case XFA_Element::Subform:
pWidget = new CXFA_FFSubForm(pNode);
break;