diff options
| author | dan sinclair <dsinclair@chromium.org> | 2017-03-13 13:26:51 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-13 17:48:39 +0000 |
| commit | d8f45b3c9f6bc16c74e17b7269269193b0d94f18 (patch) | |
| tree | 9306edc54baac391497533757fe0e952363495c2 /xfa/fde | |
| parent | 6fcea1f851880b452bbaaeeeefefa48b49cab331 (diff) | |
| download | pdfium-d8f45b3c9f6bc16c74e17b7269269193b0d94f18.tar.xz | |
Replace discrete array with a map.
There is one use of the discrete array, GFGAS_GEFont. This CL replaces
that usage with a std::map and removes the fgas_util classes.
Change-Id: Ic45812168e9487ebac08abaa131c58080a949d69
Reviewed-on: https://pdfium-review.googlesource.com/2953
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde')
| -rw-r--r-- | xfa/fde/css/fde_css.h | 1 | ||||
| -rw-r--r-- | xfa/fde/fde_iterator.cpp | 1 | ||||
| -rw-r--r-- | xfa/fde/fde_iterator.h | 1 | ||||
| -rw-r--r-- | xfa/fde/tto/fde_textout.cpp | 1 | ||||
| -rw-r--r-- | xfa/fde/tto/fde_textout.h | 1 | ||||
| -rw-r--r-- | xfa/fde/xml/fde_xml_imp.h | 2 |
6 files changed, 1 insertions, 6 deletions
diff --git a/xfa/fde/css/fde_css.h b/xfa/fde/css/fde_css.h index 6c2629f5ec..344b709487 100644 --- a/xfa/fde/css/fde_css.h +++ b/xfa/fde/css/fde_css.h @@ -9,7 +9,6 @@ #include "core/fxge/fx_dib.h" #include "xfa/fgas/crt/fgas_stream.h" -#include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/cfgas_fontmgr.h" enum FDE_CSSVALUETYPE { diff --git a/xfa/fde/fde_iterator.cpp b/xfa/fde/fde_iterator.cpp index 8cbaa33383..e9a644043d 100644 --- a/xfa/fde/fde_iterator.cpp +++ b/xfa/fde/fde_iterator.cpp @@ -7,7 +7,6 @@ #include "xfa/fde/fde_iterator.h" #include "xfa/fde/cfde_txtedtpage.h" -#include "xfa/fgas/crt/fgas_utils.h" CFDE_VisualSetIterator::CFDE_VisualSetIterator() : m_dwFilter(0) {} diff --git a/xfa/fde/fde_iterator.h b/xfa/fde/fde_iterator.h index 3cd3a6fa19..95785e448d 100644 --- a/xfa/fde/fde_iterator.h +++ b/xfa/fde/fde_iterator.h @@ -10,7 +10,6 @@ #include <stack> #include "xfa/fde/fde_visualset.h" -#include "xfa/fgas/crt/fgas_utils.h" class CFDE_TxtEdtPage; diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/tto/fde_textout.cpp index 5c59b2c8d6..0e8e91e8b1 100644 --- a/xfa/fde/tto/fde_textout.cpp +++ b/xfa/fde/tto/fde_textout.cpp @@ -15,7 +15,6 @@ #include "xfa/fde/cfde_path.h" #include "xfa/fde/fde_gedevice.h" #include "xfa/fde/fde_object.h" -#include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/layout/fgas_textbreak.h" FDE_TTOPIECE::FDE_TTOPIECE() = default; diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 15b5167e08..fa4444822d 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -16,7 +16,6 @@ #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" #include "xfa/fde/fde_object.h" -#include "xfa/fgas/crt/fgas_utils.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #define FDE_TTOSTYLE_Underline 0x0001 diff --git a/xfa/fde/xml/fde_xml_imp.h b/xfa/fde/xml/fde_xml_imp.h index 216d6f7300..d9ccbea506 100644 --- a/xfa/fde/xml/fde_xml_imp.h +++ b/xfa/fde/xml/fde_xml_imp.h @@ -11,10 +11,10 @@ #include <stack> #include <vector> +#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" #include "xfa/fde/xml/fde_xml.h" #include "xfa/fgas/crt/fgas_stream.h" -#include "xfa/fgas/crt/fgas_utils.h" class CFDE_BlockBuffer; class CFDE_XMLInstruction; |