Move fpdfsdk/pdfwindow to fpdfsdk/pwl
This makes it clearer what the directory contains.
Change-Id: I34fc38dd30b8e0f6e057052ea33c8b5a10f1b9c3
Reviewed-on: https://pdfium-review.googlesource.com/8791
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/BUILD.gn b/BUILD.gn
index ebe6c0d..9f8c52a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -189,7 +189,7 @@
":fxcrt",
":fxge",
":javascript",
- ":pdfwindow",
+ ":pwl",
"third_party:bigint",
"third_party:pdfium_base",
]
@@ -1076,40 +1076,40 @@
}
}
-static_library("pdfwindow") {
+static_library("pwl") {
sources = [
- "fpdfsdk/pdfwindow/cpwl_appstream.cpp",
- "fpdfsdk/pdfwindow/cpwl_appstream.h",
- "fpdfsdk/pdfwindow/cpwl_button.cpp",
- "fpdfsdk/pdfwindow/cpwl_button.h",
- "fpdfsdk/pdfwindow/cpwl_caret.cpp",
- "fpdfsdk/pdfwindow/cpwl_caret.h",
- "fpdfsdk/pdfwindow/cpwl_combo_box.cpp",
- "fpdfsdk/pdfwindow/cpwl_combo_box.h",
- "fpdfsdk/pdfwindow/cpwl_edit.cpp",
- "fpdfsdk/pdfwindow/cpwl_edit.h",
- "fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp",
- "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h",
- "fpdfsdk/pdfwindow/cpwl_edit_impl.cpp",
- "fpdfsdk/pdfwindow/cpwl_edit_impl.h",
- "fpdfsdk/pdfwindow/cpwl_font_map.cpp",
- "fpdfsdk/pdfwindow/cpwl_font_map.h",
- "fpdfsdk/pdfwindow/cpwl_icon.cpp",
- "fpdfsdk/pdfwindow/cpwl_icon.h",
- "fpdfsdk/pdfwindow/cpwl_list_box.cpp",
- "fpdfsdk/pdfwindow/cpwl_list_box.h",
- "fpdfsdk/pdfwindow/cpwl_list_impl.cpp",
- "fpdfsdk/pdfwindow/cpwl_list_impl.h",
- "fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp",
- "fpdfsdk/pdfwindow/cpwl_scroll_bar.h",
- "fpdfsdk/pdfwindow/cpwl_special_button.cpp",
- "fpdfsdk/pdfwindow/cpwl_special_button.h",
- "fpdfsdk/pdfwindow/cpwl_timer.cpp",
- "fpdfsdk/pdfwindow/cpwl_timer.h",
- "fpdfsdk/pdfwindow/cpwl_timer_handler.cpp",
- "fpdfsdk/pdfwindow/cpwl_timer_handler.h",
- "fpdfsdk/pdfwindow/cpwl_wnd.cpp",
- "fpdfsdk/pdfwindow/cpwl_wnd.h",
+ "fpdfsdk/pwl/cpwl_appstream.cpp",
+ "fpdfsdk/pwl/cpwl_appstream.h",
+ "fpdfsdk/pwl/cpwl_button.cpp",
+ "fpdfsdk/pwl/cpwl_button.h",
+ "fpdfsdk/pwl/cpwl_caret.cpp",
+ "fpdfsdk/pwl/cpwl_caret.h",
+ "fpdfsdk/pwl/cpwl_combo_box.cpp",
+ "fpdfsdk/pwl/cpwl_combo_box.h",
+ "fpdfsdk/pwl/cpwl_edit.cpp",
+ "fpdfsdk/pwl/cpwl_edit.h",
+ "fpdfsdk/pwl/cpwl_edit_ctrl.cpp",
+ "fpdfsdk/pwl/cpwl_edit_ctrl.h",
+ "fpdfsdk/pwl/cpwl_edit_impl.cpp",
+ "fpdfsdk/pwl/cpwl_edit_impl.h",
+ "fpdfsdk/pwl/cpwl_font_map.cpp",
+ "fpdfsdk/pwl/cpwl_font_map.h",
+ "fpdfsdk/pwl/cpwl_icon.cpp",
+ "fpdfsdk/pwl/cpwl_icon.h",
+ "fpdfsdk/pwl/cpwl_list_box.cpp",
+ "fpdfsdk/pwl/cpwl_list_box.h",
+ "fpdfsdk/pwl/cpwl_list_impl.cpp",
+ "fpdfsdk/pwl/cpwl_list_impl.h",
+ "fpdfsdk/pwl/cpwl_scroll_bar.cpp",
+ "fpdfsdk/pwl/cpwl_scroll_bar.h",
+ "fpdfsdk/pwl/cpwl_special_button.cpp",
+ "fpdfsdk/pwl/cpwl_special_button.h",
+ "fpdfsdk/pwl/cpwl_timer.cpp",
+ "fpdfsdk/pwl/cpwl_timer.h",
+ "fpdfsdk/pwl/cpwl_timer_handler.cpp",
+ "fpdfsdk/pwl/cpwl_timer_handler.h",
+ "fpdfsdk/pwl/cpwl_wnd.cpp",
+ "fpdfsdk/pwl/cpwl_wnd.h",
]
configs += [ ":pdfium_core_config" ]
deps = [
@@ -2009,8 +2009,8 @@
"fpdfsdk/fpdfview_c_api_test.h",
"fpdfsdk/fpdfview_embeddertest.cpp",
"fpdfsdk/fsdk_baseform_embeddertest.cpp",
- "fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp",
- "fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp",
+ "fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp",
+ "fpdfsdk/pwl/cpwl_edit_embeddertest.cpp",
"testing/embedder_test.cpp",
"testing/embedder_test.h",
"testing/embedder_test_mock_delegate.h",
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 8d46a74..0cf2ff3 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -73,7 +73,7 @@
```
PDF_LIBS="-lpdfium -lfpdfapi -lfxge -lfpdfdoc -lfxcrt -lfx_agg \
-lfxcodec -lfx_lpng -lfx_libopenjpeg -lfx_lcms2 -lfx_freetype -ljpeg \
--lfdrm -lpdfwindow -lbigint -lformfiller -ljavascript -lfxedit"
+-lfdrm -lpwl -lbigint -lformfiller -ljavascript -lfxedit"
PDF_DIR=<path/to/pdfium>
clang -I $PDF_DIR/public -o init init.c -L $PDF_DIR/out/Debug -lstdc++ -framework AppKit $PDF_LIBS
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index 4b85333..191f0de 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -29,8 +29,8 @@
#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/fsdk_actionhandler.h"
#include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_appstream.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_appstream.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
#ifdef PDF_ENABLE_XFA
#include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h
index 17b7b4e..7eb7d4e 100644
--- a/fpdfsdk/formfiller/cba_fontmap.h
+++ b/fpdfsdk/formfiller/cba_fontmap.h
@@ -8,7 +8,7 @@
#define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
#include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
class CPDF_Dictionary;
class CPDFSDK_Annot;
diff --git a/fpdfsdk/formfiller/cffl_checkbox.cpp b/fpdfsdk/formfiller/cffl_checkbox.cpp
index 4bab95a..1a3ccca 100644
--- a/fpdfsdk/formfiller/cffl_checkbox.cpp
+++ b/fpdfsdk/formfiller/cffl_checkbox.cpp
@@ -9,7 +9,7 @@
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
#include "public/fpdf_fwlevent.h"
CFFL_CheckBox::CFFL_CheckBox(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index cbd00bc..c4554c1 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -12,7 +12,7 @@
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/fsdk_common.h"
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
#include "third_party/base/ptr_util.h"
CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index 744d522..17e9407 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
class CFFL_FormFiller;
class CPDFSDK_FormFillEnvironment;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 4a6264d..ca983d8 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -12,7 +12,7 @@
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/fsdk_common.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
#include "third_party/base/ptr_util.h"
#define FFL_DEFAULTLISTBOXFONTSIZE 12.0f
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index d0d51b7..2f75f4c 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -7,7 +7,7 @@
#include "fpdfsdk/formfiller/cffl_pushbutton.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
CFFL_PushButton::CFFL_PushButton(CPDFSDK_FormFillEnvironment* pApp,
CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/formfiller/cffl_radiobutton.cpp b/fpdfsdk/formfiller/cffl_radiobutton.cpp
index e36e1f7..6c8d5a3 100644
--- a/fpdfsdk/formfiller/cffl_radiobutton.cpp
+++ b/fpdfsdk/formfiller/cffl_radiobutton.cpp
@@ -9,7 +9,7 @@
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
#include "public/fpdf_fwlevent.h"
CFFL_RadioButton::CFFL_RadioButton(CPDFSDK_FormFillEnvironment* pApp,
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp
index c424152..5dca481 100644
--- a/fpdfsdk/fpdf_sysfontinfo.cpp
+++ b/fpdfsdk/fpdf_sysfontinfo.cpp
@@ -14,7 +14,7 @@
#include "core/fxge/fx_font.h"
#include "core/fxge/ifx_systemfontinfo.h"
#include "fpdfsdk/fsdk_define.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
#include "third_party/base/ptr_util.h"
static_assert(FXFONT_ANSI_CHARSET == FX_CHARSET_ANSI, "Charset must match");
diff --git a/fpdfsdk/javascript/color.h b/fpdfsdk/javascript/color.h
index e67d4d5..5d6a657 100644
--- a/fpdfsdk/javascript/color.h
+++ b/fpdfsdk/javascript/color.h
@@ -10,7 +10,7 @@
#include <vector>
#include "fpdfsdk/javascript/JS_Define.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class color : public CJS_EmbedObj {
public:
diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp
similarity index 99%
rename from fpdfsdk/pdfwindow/cpwl_appstream.cpp
rename to fpdfsdk/pwl/cpwl_appstream.cpp
index 23ebf4f..fe40163 100644
--- a/fpdfsdk/pdfwindow/cpwl_appstream.cpp
+++ b/fpdfsdk/pwl/cpwl_appstream.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_appstream.h"
+#include "fpdfsdk/pwl/cpwl_appstream.h"
#include <utility>
@@ -22,10 +22,10 @@
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/formfiller/cba_fontmap.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_icon.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_icon.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
namespace {
diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.h b/fpdfsdk/pwl/cpwl_appstream.h
similarity index 89%
rename from fpdfsdk/pdfwindow/cpwl_appstream.h
rename to fpdfsdk/pwl/cpwl_appstream.h
index 5613786..2043c7b 100644
--- a/fpdfsdk/pdfwindow/cpwl_appstream.h
+++ b/fpdfsdk/pwl/cpwl_appstream.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
-#define FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
+#ifndef FPDFSDK_PWL_CPWL_APPSTREAM_H_
+#define FPDFSDK_PWL_CPWL_APPSTREAM_H_
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
@@ -40,4 +40,4 @@
CFX_UnownedPtr<CPDF_Dictionary> dict_;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_APPSTREAM_H_
+#endif // FPDFSDK_PWL_CPWL_APPSTREAM_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_button.cpp b/fpdfsdk/pwl/cpwl_button.cpp
similarity index 90%
rename from fpdfsdk/pdfwindow/cpwl_button.cpp
rename to fpdfsdk/pwl/cpwl_button.cpp
index fad3632..525148a 100644
--- a/fpdfsdk/pdfwindow/cpwl_button.cpp
+++ b/fpdfsdk/pwl/cpwl_button.cpp
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
CPWL_Button::CPWL_Button() : m_bMouseDown(false) {}
diff --git a/fpdfsdk/pdfwindow/cpwl_button.h b/fpdfsdk/pwl/cpwl_button.h
similarity index 78%
rename from fpdfsdk/pdfwindow/cpwl_button.h
rename to fpdfsdk/pwl/cpwl_button.h
index 9f4a477..44cc1e2 100644
--- a/fpdfsdk/pdfwindow/cpwl_button.h
+++ b/fpdfsdk/pwl/cpwl_button.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
+#ifndef FPDFSDK_PWL_CPWL_BUTTON_H_
+#define FPDFSDK_PWL_CPWL_BUTTON_H_
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_Button : public CPWL_Wnd {
public:
@@ -24,4 +24,4 @@
bool m_bMouseDown;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_BUTTON_H_
+#endif // FPDFSDK_PWL_CPWL_BUTTON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_caret.cpp b/fpdfsdk/pwl/cpwl_caret.cpp
similarity index 96%
rename from fpdfsdk/pdfwindow/cpwl_caret.cpp
rename to fpdfsdk/pwl/cpwl_caret.cpp
index a9a5b86..d309d27 100644
--- a/fpdfsdk/pdfwindow/cpwl_caret.cpp
+++ b/fpdfsdk/pwl/cpwl_caret.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
#include <sstream>
#include "core/fxge/cfx_graphstatedata.h"
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#define PWL_CARET_FLASHINTERVAL 500
diff --git a/fpdfsdk/pdfwindow/cpwl_caret.h b/fpdfsdk/pwl/cpwl_caret.h
similarity index 85%
rename from fpdfsdk/pdfwindow/cpwl_caret.h
rename to fpdfsdk/pwl/cpwl_caret.h
index 6d6dcd5..a8ae5a3 100644
--- a/fpdfsdk/pdfwindow/cpwl_caret.h
+++ b/fpdfsdk/pwl/cpwl_caret.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_CARET_H_
-#define FPDFSDK_PDFWINDOW_CPWL_CARET_H_
+#ifndef FPDFSDK_PWL_CPWL_CARET_H_
+#define FPDFSDK_PWL_CPWL_CARET_H_
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_Caret : public CPWL_Wnd {
public:
@@ -38,4 +38,4 @@
CFX_FloatRect m_rcInvalid;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_CARET_H_
+#endif // FPDFSDK_PWL_CPWL_CARET_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp
similarity index 97%
rename from fpdfsdk/pdfwindow/cpwl_combo_box.cpp
rename to fpdfsdk/pwl/cpwl_combo_box.cpp
index 90c8cc6..9514e55 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box.cpp
@@ -4,18 +4,18 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
#include <algorithm>
#include <sstream>
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
namespace {
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h
similarity index 91%
rename from fpdfsdk/pdfwindow/cpwl_combo_box.h
rename to fpdfsdk/pwl/cpwl_combo_box.h
index 530ff0a..a50c4ce 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box.h
+++ b/fpdfsdk/pwl/cpwl_combo_box.h
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
-#define FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
+#ifndef FPDFSDK_PWL_CPWL_COMBO_BOX_H_
+#define FPDFSDK_PWL_CPWL_COMBO_BOX_H_
#include <memory>
#include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_CBListBox : public CPWL_ListBox {
public:
@@ -100,4 +100,4 @@
CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_COMBO_BOX_H_
+#endif // FPDFSDK_PWL_CPWL_COMBO_BOX_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
similarity index 98%
rename from fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp
rename to fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
index 3224284..afca67f 100644
--- a/fpdfsdk/pdfwindow/cpwl_combo_box_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box_embeddertest.cpp
@@ -7,8 +7,8 @@
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_combo_box.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_combo_box.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
similarity index 98%
rename from fpdfsdk/pdfwindow/cpwl_edit.cpp
rename to fpdfsdk/pwl/cpwl_edit.cpp
index 8588de7..4a19e70 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
#include <algorithm>
#include <memory>
@@ -20,12 +20,12 @@
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
#include "core/fxge/fx_font.h"
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
#include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h
similarity index 96%
rename from fpdfsdk/pdfwindow/cpwl_edit.h
rename to fpdfsdk/pwl/cpwl_edit.h
index 366d085..2e92ed2 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit.h
+++ b/fpdfsdk/pwl/cpwl_edit.h
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_H_
+#define FPDFSDK_PWL_CPWL_EDIT_H_
#include <utility>
#include "core/fpdfdoc/cpvt_wordrange.h"
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_basic.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
class IPWL_Filler_Notify {
public:
@@ -126,4 +126,4 @@
CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_EDIT_H_
+#endif // FPDFSDK_PWL_CPWL_EDIT_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
similarity index 96%
rename from fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
rename to fpdfsdk/pwl/cpwl_edit_ctrl.cpp
index a3aac19..a852cb6 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.cpp
@@ -4,16 +4,16 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
#include "core/fpdfdoc/cpvt_section.h"
#include "core/fpdfdoc/cpvt_word.h"
#include "core/fxge/fx_font.h"
-#include "fpdfsdk/pdfwindow/cpwl_caret.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_caret.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
CPWL_EditCtrl::CPWL_EditCtrl()
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h b/fpdfsdk/pwl/cpwl_edit_ctrl.h
similarity index 93%
rename from fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
rename to fpdfsdk/pwl/cpwl_edit_ctrl.h
index 30c2d63..4fb86fa 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_ctrl.h
+++ b/fpdfsdk/pwl/cpwl_edit_ctrl.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
+#define FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
#include <memory>
#include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_EditImpl;
class CPWL_Caret;
@@ -93,4 +93,4 @@
int32_t m_nCharSet;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_EDIT_CTRL_H_
+#endif // FPDFSDK_PWL_CPWL_EDIT_CTRL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
similarity index 99%
rename from fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp
rename to fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
index 2b1bbd4..e41d9b0 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_embeddertest.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_embeddertest.cpp
@@ -7,7 +7,7 @@
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/formfiller/cffl_formfiller.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp
similarity index 99%
rename from fpdfsdk/pdfwindow/cpwl_edit_impl.cpp
rename to fpdfsdk/pwl/cpwl_edit_impl.cpp
index 0f5cf05..c59a740 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
#include <algorithm>
#include <memory>
@@ -27,9 +27,9 @@
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/cfx_systemhandler.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h
similarity index 98%
rename from fpdfsdk/pdfwindow/cpwl_edit_impl.h
rename to fpdfsdk/pwl/cpwl_edit_impl.h
index 53ed8da..697ca84 100644
--- a/fpdfsdk/pdfwindow/cpwl_edit_impl.h
+++ b/fpdfsdk/pwl/cpwl_edit_impl.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
+#ifndef FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
+#define FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
#include <deque>
#include <memory>
@@ -512,4 +512,4 @@
IPVT_FontMap* m_pFontMap;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_EDIT_IMPL_H_
+#endif // FPDFSDK_PWL_CPWL_EDIT_IMPL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.cpp b/fpdfsdk/pwl/cpwl_font_map.cpp
similarity index 98%
rename from fpdfsdk/pdfwindow/cpwl_font_map.cpp
rename to fpdfsdk/pwl/cpwl_font_map.cpp
index f0c74ba..8629735 100644
--- a/fpdfsdk/pdfwindow/cpwl_font_map.cpp
+++ b/fpdfsdk/pwl/cpwl_font_map.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_font_map.h"
+#include "fpdfsdk/pwl/cpwl_font_map.h"
#include <utility>
@@ -15,7 +15,7 @@
#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfdoc/ipvt_fontmap.h"
#include "core/fxcrt/fx_codepage.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h
similarity index 95%
rename from fpdfsdk/pdfwindow/cpwl_font_map.h
rename to fpdfsdk/pwl/cpwl_font_map.h
index e1a3ede..9872779 100644
--- a/fpdfsdk/pdfwindow/cpwl_font_map.h
+++ b/fpdfsdk/pwl/cpwl_font_map.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
-#define FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
+#ifndef FPDFSDK_PWL_CPWL_FONT_MAP_H_
+#define FPDFSDK_PWL_CPWL_FONT_MAP_H_
#include <memory>
#include <vector>
@@ -92,4 +92,4 @@
CFX_UnownedPtr<CFX_SystemHandler> const m_pSystemHandler;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_FONT_MAP_H_
+#endif // FPDFSDK_PWL_CPWL_FONT_MAP_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_icon.cpp b/fpdfsdk/pwl/cpwl_icon.cpp
similarity index 97%
rename from fpdfsdk/pdfwindow/cpwl_icon.cpp
rename to fpdfsdk/pwl/cpwl_icon.cpp
index 4de3e70..8a2e31d 100644
--- a/fpdfsdk/pdfwindow/cpwl_icon.cpp
+++ b/fpdfsdk/pwl/cpwl_icon.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_icon.h"
+#include "fpdfsdk/pwl/cpwl_icon.h"
#include <algorithm>
#include <sstream>
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
CPWL_Icon::CPWL_Icon() : m_pPDFStream(nullptr), m_pIconFit(nullptr) {}
diff --git a/fpdfsdk/pdfwindow/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h
similarity index 85%
rename from fpdfsdk/pdfwindow/cpwl_icon.h
rename to fpdfsdk/pwl/cpwl_icon.h
index e97c540..2607e56 100644
--- a/fpdfsdk/pdfwindow/cpwl_icon.h
+++ b/fpdfsdk/pwl/cpwl_icon.h
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_ICON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_ICON_H_
+#ifndef FPDFSDK_PWL_CPWL_ICON_H_
+#define FPDFSDK_PWL_CPWL_ICON_H_
#include <utility>
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_Icon : public CPWL_Wnd {
public:
@@ -41,4 +41,4 @@
CFX_UnownedPtr<CPDF_IconFit> m_pIconFit;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_ICON_H_
+#endif // FPDFSDK_PWL_CPWL_ICON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.cpp b/fpdfsdk/pwl/cpwl_list_box.cpp
similarity index 96%
rename from fpdfsdk/pdfwindow/cpwl_list_box.cpp
rename to fpdfsdk/pwl/cpwl_list_box.cpp
index 7e820bf..060b3f6 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_box.cpp
+++ b/fpdfsdk/pwl/cpwl_list_box.cpp
@@ -4,17 +4,17 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
#include <sstream>
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_ctrl.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_edit.h"
+#include "fpdfsdk/pwl/cpwl_edit_ctrl.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include "public/fpdf_fwlevent.h"
#include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
similarity index 94%
rename from fpdfsdk/pdfwindow/cpwl_list_box.h
rename to fpdfsdk/pwl/cpwl_list_box.h
index d76c7a5..8938f24 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -4,13 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
-#define FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
+#ifndef FPDFSDK_PWL_CPWL_LIST_BOX_H_
+#define FPDFSDK_PWL_CPWL_LIST_BOX_H_
#include <memory>
#include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_ListCtrl;
class CPWL_List_Notify;
@@ -107,4 +107,4 @@
CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_LIST_BOX_H_
+#endif // FPDFSDK_PWL_CPWL_LIST_BOX_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_list_impl.cpp b/fpdfsdk/pwl/cpwl_list_impl.cpp
similarity index 98%
rename from fpdfsdk/pdfwindow/cpwl_list_impl.cpp
rename to fpdfsdk/pwl/cpwl_list_impl.cpp
index 66b2e77..94e0606 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_impl.cpp
+++ b/fpdfsdk/pwl/cpwl_list_impl.cpp
@@ -4,15 +4,15 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_list_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_impl.h"
#include <algorithm>
#include <utility>
#include "core/fpdfdoc/cpvt_word.h"
#include "core/fxcrt/fx_extension.h"
-#include "fpdfsdk/pdfwindow/cpwl_edit_impl.h"
-#include "fpdfsdk/pdfwindow/cpwl_list_box.h"
+#include "fpdfsdk/pwl/cpwl_edit_impl.h"
+#include "fpdfsdk/pwl/cpwl_list_box.h"
#include "third_party/base/stl_util.h"
CPWL_ListCtrl::Item::Item()
diff --git a/fpdfsdk/pdfwindow/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h
similarity index 97%
rename from fpdfsdk/pdfwindow/cpwl_list_impl.h
rename to fpdfsdk/pwl/cpwl_list_impl.h
index 167def05..ca159b7 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_impl.h
+++ b/fpdfsdk/pwl/cpwl_list_impl.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
-#define FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
+#ifndef FPDFSDK_PWL_CPWL_LIST_IMPL_H_
+#define FPDFSDK_PWL_CPWL_LIST_IMPL_H_
#include <map>
#include <memory>
@@ -165,4 +165,4 @@
bool m_bMultiple;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_LIST_IMPL_H_
+#endif // FPDFSDK_PWL_CPWL_LIST_IMPL_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
similarity index 99%
rename from fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
rename to fpdfsdk/pwl/cpwl_scroll_bar.cpp
index c607ee7..19e4bc8 100644
--- a/fpdfsdk/pdfwindow/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
#include <algorithm>
#include <sstream>
@@ -12,7 +12,7 @@
#include "core/fxge/cfx_pathdata.h"
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
namespace {
diff --git a/fpdfsdk/pdfwindow/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
similarity index 96%
rename from fpdfsdk/pdfwindow/cpwl_scroll_bar.h
rename to fpdfsdk/pwl/cpwl_scroll_bar.h
index f9887e5..c78b6e3 100644
--- a/fpdfsdk/pdfwindow/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -4,11 +4,11 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
-#define FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
+#ifndef FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
+#define FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
#include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
class CPWL_SBButton;
class CPWL_ScrollBar;
@@ -181,4 +181,4 @@
float m_fOldPosButton;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_SCROLL_BAR_H_
+#endif // FPDFSDK_PWL_CPWL_SCROLL_BAR_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_special_button.cpp b/fpdfsdk/pwl/cpwl_special_button.cpp
similarity index 92%
rename from fpdfsdk/pdfwindow/cpwl_special_button.cpp
rename to fpdfsdk/pwl/cpwl_special_button.cpp
index b911d5e..53f7f2c 100644
--- a/fpdfsdk/pdfwindow/cpwl_special_button.cpp
+++ b/fpdfsdk/pwl/cpwl_special_button.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_special_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_special_button.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
CPWL_PushButton::CPWL_PushButton() {}
diff --git a/fpdfsdk/pdfwindow/cpwl_special_button.h b/fpdfsdk/pwl/cpwl_special_button.h
similarity index 86%
rename from fpdfsdk/pdfwindow/cpwl_special_button.h
rename to fpdfsdk/pwl/cpwl_special_button.h
index ed80d31..b499542 100644
--- a/fpdfsdk/pdfwindow/cpwl_special_button.h
+++ b/fpdfsdk/pwl/cpwl_special_button.h
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
-#define FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
+#ifndef FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
+#define FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
-#include "fpdfsdk/pdfwindow/cpwl_button.h"
+#include "fpdfsdk/pwl/cpwl_button.h"
class CPWL_PushButton : public CPWL_Button {
public:
@@ -53,4 +53,4 @@
bool m_bChecked;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_SPECIAL_BUTTON_H_
+#endif // FPDFSDK_PWL_CPWL_SPECIAL_BUTTON_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_timer.cpp b/fpdfsdk/pwl/cpwl_timer.cpp
similarity index 93%
rename from fpdfsdk/pdfwindow/cpwl_timer.cpp
rename to fpdfsdk/pwl/cpwl_timer.cpp
index 03b1838..34f81fc 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer.cpp
+++ b/fpdfsdk/pwl/cpwl_timer.cpp
@@ -4,12 +4,12 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
#include <map>
#include "fpdfsdk/cfx_systemhandler.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
namespace {
diff --git a/fpdfsdk/pdfwindow/cpwl_timer.h b/fpdfsdk/pwl/cpwl_timer.h
similarity index 85%
rename from fpdfsdk/pdfwindow/cpwl_timer.h
rename to fpdfsdk/pwl/cpwl_timer.h
index 32a68fc..6f76fe7 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer.h
+++ b/fpdfsdk/pwl/cpwl_timer.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
-#define FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
+#ifndef FPDFSDK_PWL_CPWL_TIMER_H_
+#define FPDFSDK_PWL_CPWL_TIMER_H_
#include "core/fxcrt/cfx_unowned_ptr.h"
#include "core/fxcrt/fx_basic.h"
@@ -29,4 +29,4 @@
CFX_UnownedPtr<CFX_SystemHandler> m_pSystemHandler;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_TIMER_H_
+#endif // FPDFSDK_PWL_CPWL_TIMER_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_timer_handler.cpp b/fpdfsdk/pwl/cpwl_timer_handler.cpp
similarity index 87%
rename from fpdfsdk/pdfwindow/cpwl_timer_handler.cpp
rename to fpdfsdk/pwl/cpwl_timer_handler.cpp
index 3edaa8d..33af306 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer_handler.cpp
+++ b/fpdfsdk/pwl/cpwl_timer_handler.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
#include "third_party/base/ptr_util.h"
CPWL_TimerHandler::CPWL_TimerHandler() {}
diff --git a/fpdfsdk/pdfwindow/cpwl_timer_handler.h b/fpdfsdk/pwl/cpwl_timer_handler.h
similarity index 80%
rename from fpdfsdk/pdfwindow/cpwl_timer_handler.h
rename to fpdfsdk/pwl/cpwl_timer_handler.h
index f6ffd44..b65a515 100644
--- a/fpdfsdk/pdfwindow/cpwl_timer_handler.h
+++ b/fpdfsdk/pwl/cpwl_timer_handler.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
-#define FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
+#ifndef FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
+#define FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
#include <memory>
@@ -29,4 +29,4 @@
std::unique_ptr<CPWL_Timer> m_pTimer;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_TIMER_HANDLER_H_
+#endif // FPDFSDK_PWL_CPWL_TIMER_HANDLER_H_
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
similarity index 99%
rename from fpdfsdk/pdfwindow/cpwl_wnd.cpp
rename to fpdfsdk/pwl/cpwl_wnd.cpp
index 58824af..2269162 100644
--- a/fpdfsdk/pdfwindow/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -4,14 +4,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/pdfwindow/cpwl_wnd.h"
+#include "fpdfsdk/pwl/cpwl_wnd.h"
#include <map>
#include <sstream>
#include <vector>
#include "core/fxge/cfx_renderdevice.h"
-#include "fpdfsdk/pdfwindow/cpwl_scroll_bar.h"
+#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/pdfwindow/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h
similarity index 97%
rename from fpdfsdk/pdfwindow/cpwl_wnd.h
rename to fpdfsdk/pwl/cpwl_wnd.h
index d56369c..7c93216 100644
--- a/fpdfsdk/pdfwindow/cpwl_wnd.h
+++ b/fpdfsdk/pwl/cpwl_wnd.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_PDFWINDOW_CPWL_WND_H_
-#define FPDFSDK_PDFWINDOW_CPWL_WND_H_
+#ifndef FPDFSDK_PWL_CPWL_WND_H_
+#define FPDFSDK_PWL_CPWL_WND_H_
#include <memory>
#include <vector>
@@ -17,8 +17,8 @@
#include "core/fxge/cfx_color.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer.h"
-#include "fpdfsdk/pdfwindow/cpwl_timer_handler.h"
+#include "fpdfsdk/pwl/cpwl_timer.h"
+#include "fpdfsdk/pwl/cpwl_timer_handler.h"
class CPWL_Edit;
class CPWL_MsgControl;
@@ -341,4 +341,4 @@
bool m_bEnabled;
};
-#endif // FPDFSDK_PDFWINDOW_CPWL_WND_H_
+#endif // FPDFSDK_PWL_CPWL_WND_H_
