Move CPDFSDK_FormFillEnvironment::Is{SHIFT,CTRL,ALT}KeyDown to CPWL_Wnd
Removes an include of top-level fpdfsdk/ in fpdfsdk/pwl at the expense
of having another public/fwl_event.h include in cpwl_wnd.h (there are
several pre-existing instances of this public file used in pwl/).
In turn, fix some IWYU exposed by the change.
Change-Id: I1bc299f565aed4b4494bc4b969e5ad27aeb6263b
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/58613
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index b1a31fe..f4807b6 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -19,6 +19,7 @@
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/cpdfsdk_widgethandler.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
#include "third_party/base/ptr_util.h"
@@ -225,16 +226,15 @@
bool CPDFSDK_AnnotHandlerMgr::Annot_OnKeyDown(CPDFSDK_Annot* pAnnot,
int nKeyCode,
int nFlag) {
- if (CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag) ||
- CPDFSDK_FormFillEnvironment::IsALTKeyDown(nFlag)) {
+ if (CPWL_Wnd::IsCTRLKeyDown(nFlag) || CPWL_Wnd::IsALTKeyDown(nFlag)) {
return GetAnnotHandler(pAnnot)->OnKeyDown(pAnnot, nKeyCode, nFlag);
}
ObservedPtr<CPDFSDK_Annot> pObservedAnnot(pAnnot);
CPDFSDK_PageView* pPage = pAnnot->GetPageView();
CPDFSDK_Annot* pFocusAnnot = pPage->GetFocusAnnot();
if (pFocusAnnot && (nKeyCode == FWL_VKEY_Tab)) {
- ObservedPtr<CPDFSDK_Annot> pNext(GetNextAnnot(
- pFocusAnnot, !CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag)));
+ ObservedPtr<CPDFSDK_Annot> pNext(
+ GetNextAnnot(pFocusAnnot, !CPWL_Wnd::IsSHIFTKeyDown(nFlag)));
if (pNext && pNext.Get() != pFocusAnnot) {
pPage->GetFormFillEnv()->SetFocusAnnot(&pNext);
return true;
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index 81fd110..53bc723 100755
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -21,7 +21,6 @@
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fxjs/ijs_runtime.h"
-#include "public/fpdf_fwlevent.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
@@ -65,21 +64,6 @@
m_pInfo->Release(m_pInfo);
}
-// static
-bool CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(uint32_t nFlag) {
- return !!(nFlag & FWL_EVENTFLAG_ShiftKey);
-}
-
-// static
-bool CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(uint32_t nFlag) {
- return !!(nFlag & FWL_EVENTFLAG_ControlKey);
-}
-
-// static
-bool CPDFSDK_FormFillEnvironment::IsALTKeyDown(uint32_t nFlag) {
- return !!(nFlag & FWL_EVENTFLAG_AltKey);
-}
-
#ifdef PDF_ENABLE_V8
int CPDFSDK_FormFillEnvironment::JS_appAlert(const WideString& Msg,
const WideString& Title,
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index 0a902c9..c0b210c 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -50,10 +50,6 @@
CPDFSDK_FormFillEnvironment(CPDF_Document* pDoc, FPDF_FORMFILLINFO* pFFinfo);
~CPDFSDK_FormFillEnvironment();
- static bool IsSHIFTKeyDown(uint32_t nFlag);
- static bool IsCTRLKeyDown(uint32_t nFlag);
- static bool IsALTKeyDown(uint32_t nFlag);
-
CPDFSDK_PageView* GetPageView(IPDF_Page* pUnderlyingPage, bool renew);
CPDFSDK_PageView* GetPageView(int nIndex);
#ifdef PDF_ENABLE_V8
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index e2c3b88..b760365 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -127,8 +127,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::kCursorEnter, &fa, pPageView);
m_bNotifying = false;
if (!pAnnot->HasObservable())
@@ -160,8 +160,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::kCursorExit, &fa, pPageView);
m_bNotifying = false;
if (!pAnnot->HasObservable())
@@ -196,8 +196,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlags);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlags);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlags);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlags);
pWidget->OnAAction(CPDF_AAction::kButtonDown, &fa, pPageView);
m_bNotifying = false;
if (!pAnnot->HasObservable())
@@ -274,8 +274,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::kButtonUp, &fa, pPageView);
m_bNotifying = false;
if (!pAnnot->HasObservable() || !IsValidAnnot(pPageView, pWidget))
@@ -400,8 +400,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pFormFiller->GetActionData(pPageView, CPDF_AAction::kGetFocus, fa);
pWidget->OnAAction(CPDF_AAction::kGetFocus, &fa, pPageView);
m_bNotifying = false;
@@ -451,8 +451,8 @@
ASSERT(pPageView);
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pFormFiller->GetActionData(pPageView, CPDF_AAction::kLoseFocus, fa);
pWidget->OnAAction(CPDF_AAction::kLoseFocus, &fa, pPageView);
m_bNotifying = false;
@@ -659,8 +659,8 @@
pWidget->ClearAppModified();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
fa.bWillCommit = true;
fa.bKeyDown = true;
fa.bRC = true;
@@ -691,8 +691,8 @@
pWidget->ClearAppModified();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
fa.bKeyDown = true;
fa.bRC = true;
@@ -761,8 +761,8 @@
uint32_t nValueAge = pWidget->GetValueAge();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnXFAAAction(PDFSDK_XFA_Click, &fa, pPageView);
m_bNotifying = false;
@@ -791,8 +791,8 @@
uint32_t nValueAge = pWidget->GetValueAge();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnXFAAAction(PDFSDK_XFA_Full, &fa, pPageView);
m_bNotifying = false;
@@ -842,8 +842,8 @@
uint32_t nValueAge = pWidget->GetValueAge();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnXFAAAction(PDFSDK_XFA_PreOpen, &fa, pPageView);
m_bNotifying = false;
@@ -873,8 +873,8 @@
uint32_t nValueAge = pWidget->GetValueAge();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
pWidget->OnXFAAAction(PDFSDK_XFA_PostOpen, &fa, pPageView);
m_bNotifying = false;
@@ -932,8 +932,8 @@
privateData.pPageView->GetFormFillEnv();
CPDFSDK_FieldAction fa;
- fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
- fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ fa.bModifier = CPWL_Wnd::IsCTRLKeyDown(nFlag);
+ fa.bShift = CPWL_Wnd::IsSHIFTKeyDown(nFlag);
fa.sChange = strChange;
fa.sChangeEx = strChangeEx;
fa.bKeyDown = bKeyDown;
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index 1370b25..6541374 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -14,6 +14,7 @@
#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CFFL_FormFiller;
class CPDFSDK_FormFillEnvironment;
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index 4f80593..9843d54 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -10,6 +10,7 @@
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/pwl/cpwl_special_button.h"
+#include "third_party/base/ptr_util.h"
CFFL_PushButton::CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp,
CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/pwl/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp
index 055f63f..1a9e248 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box.cpp
@@ -18,6 +18,7 @@
#include "fpdfsdk/pwl/cpwl_list_impl.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
+#include "third_party/base/ptr_util.h"
namespace {
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
index 42437c7..f5cdc01 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -14,6 +14,7 @@
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/pwl/cpwl_wnd.h"
+#include "third_party/base/ptr_util.h"
namespace {
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index 4805ff2..3d8e84d 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -13,6 +13,8 @@
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "public/fpdf_fwlevent.h"
+#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
namespace {
@@ -100,6 +102,21 @@
UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd;
};
+// static
+bool CPWL_Wnd::IsSHIFTKeyDown(uint32_t nFlag) {
+ return !!(nFlag & FWL_EVENTFLAG_ShiftKey);
+}
+
+// static
+bool CPWL_Wnd::IsCTRLKeyDown(uint32_t nFlag) {
+ return !!(nFlag & FWL_EVENTFLAG_ControlKey);
+}
+
+// static
+bool CPWL_Wnd::IsALTKeyDown(uint32_t nFlag) {
+ return !!(nFlag & FWL_EVENTFLAG_AltKey);
+}
+
CPWL_Wnd::CPWL_Wnd(const CreateParams& cp,
std::unique_ptr<PrivateData> pAttachedData)
: m_CreationParams(cp), m_pAttachedData(std::move(pAttachedData)) {}
diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
index af1d889..b0adc89 100644
--- a/fpdfsdk/pwl/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -15,7 +15,6 @@
#include "core/fxcrt/unowned_ptr.h"
#include "core/fxge/cfx_color.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/pwl/cpwl_timer.h"
#include "fpdfsdk/pwl/cpwl_timer_handler.h"
@@ -141,6 +140,10 @@
CFX_Matrix mtChild; // ignore
};
+ static bool IsSHIFTKeyDown(uint32_t nFlag);
+ static bool IsCTRLKeyDown(uint32_t nFlag);
+ static bool IsALTKeyDown(uint32_t nFlag);
+
CPWL_Wnd(const CreateParams& cp, std::unique_ptr<PrivateData> pAttachedData);
~CPWL_Wnd() override;
@@ -284,13 +287,13 @@
bool IsWndCaptureKeyboard(const CPWL_Wnd* pWnd) const;
static bool IsCTRLpressed(uint32_t nFlag) {
- return CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
+ return CPWL_Wnd::IsCTRLKeyDown(nFlag);
}
static bool IsSHIFTpressed(uint32_t nFlag) {
- return CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
+ return CPWL_Wnd::IsSHIFTKeyDown(nFlag);
}
static bool IsALTpressed(uint32_t nFlag) {
- return CPDFSDK_FormFillEnvironment::IsALTKeyDown(nFlag);
+ return CPWL_Wnd::IsALTKeyDown(nFlag);
}
private:
