diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-01-19 10:27:58 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-01-19 15:49:07 +0000 |
| commit | 95bec8046a28928df627ce4d48eee8b209b3e36e (patch) | |
| tree | 46913cf24aacfc88a89bb55edcce8e3a2e724c4b /xfa/fxfa | |
| parent | dd533baad22f5143c093b98e98463a0dc62899ea (diff) | |
| download | pdfium-95bec8046a28928df627ce4d48eee8b209b3e36e.tar.xz | |
Split fde/css files into individual class files.
This CL splits the files in xfa/fde/css into class per file and renames any
needed files to match the class names.
Update some of the classes to use std::stack.
Change-Id: I4eca0fb3556d949a15a873bb0f0fd732f47e4fb1
Reviewed-on: https://pdfium-review.googlesource.com/2253
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/app/cxfa_textlayout.cpp | 3 | ||||
| -rw-r--r-- | xfa/fxfa/app/cxfa_textparsecontext.cpp | 5 | ||||
| -rw-r--r-- | xfa/fxfa/app/cxfa_textparser.cpp | 6 | ||||
| -rw-r--r-- | xfa/fxfa/app/cxfa_textuserdata.cpp | 3 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_scriptcontext.cpp | 2 |
5 files changed, 12 insertions, 7 deletions
diff --git a/xfa/fxfa/app/cxfa_textlayout.cpp b/xfa/fxfa/app/cxfa_textlayout.cpp index d831b600dc..788fea2e7d 100644 --- a/xfa/fxfa/app/cxfa_textlayout.cpp +++ b/xfa/fxfa/app/cxfa_textlayout.cpp @@ -12,7 +12,8 @@ #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fde/cfde_path.h" -#include "xfa/fde/css/fde_cssstyleselector.h" +#include "xfa/fde/css/cfde_csscomputedstyle.h" +#include "xfa/fde/css/cfde_cssstyleselector.h" #include "xfa/fde/fde_gedevice.h" #include "xfa/fde/fde_object.h" #include "xfa/fde/xml/fde_xml_imp.h" diff --git a/xfa/fxfa/app/cxfa_textparsecontext.cpp b/xfa/fxfa/app/cxfa_textparsecontext.cpp index e416242309..c0c226c4ac 100644 --- a/xfa/fxfa/app/cxfa_textparsecontext.cpp +++ b/xfa/fxfa/app/cxfa_textparsecontext.cpp @@ -6,8 +6,9 @@ #include "xfa/fxfa/app/cxfa_textparsecontext.h" -#include "xfa/fde/css/fde_cssdeclaration.h" -#include "xfa/fde/css/fde_cssstyleselector.h" +#include "xfa/fde/css/cfde_csscomputedstyle.h" +#include "xfa/fde/css/cfde_cssdeclaration.h" +#include "xfa/fde/css/cfde_cssstyleselector.h" CXFA_TextParseContext::CXFA_TextParseContext() : m_pParentStyle(nullptr), diff --git a/xfa/fxfa/app/cxfa_textparser.cpp b/xfa/fxfa/app/cxfa_textparser.cpp index 1f8036937e..9920f6e723 100644 --- a/xfa/fxfa/app/cxfa_textparser.cpp +++ b/xfa/fxfa/app/cxfa_textparser.cpp @@ -9,9 +9,11 @@ #include <algorithm> #include "third_party/base/ptr_util.h" +#include "xfa/fde/css/cfde_cssaccelerator.h" +#include "xfa/fde/css/cfde_csscomputedstyle.h" +#include "xfa/fde/css/cfde_cssstyleselector.h" +#include "xfa/fde/css/cfde_cssstylesheet.h" #include "xfa/fde/css/fde_css.h" -#include "xfa/fde/css/fde_cssstyleselector.h" -#include "xfa/fde/css/fde_cssstylesheet.h" #include "xfa/fgas/crt/fgas_codepage.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fxfa/app/cxfa_csstagprovider.h" diff --git a/xfa/fxfa/app/cxfa_textuserdata.cpp b/xfa/fxfa/app/cxfa_textuserdata.cpp index 7087810f4d..4fdabd6bb3 100644 --- a/xfa/fxfa/app/cxfa_textuserdata.cpp +++ b/xfa/fxfa/app/cxfa_textuserdata.cpp @@ -6,8 +6,9 @@ #include "xfa/fxfa/app/cxfa_textuserdata.h" +#include "xfa/fde/css/cfde_csscomputedstyle.h" +#include "xfa/fde/css/cfde_cssstyleselector.h" #include "xfa/fde/css/fde_css.h" -#include "xfa/fde/css/fde_cssstyleselector.h" #include "xfa/fxfa/app/cxfa_linkuserdata.h" CXFA_TextUserData::CXFA_TextUserData(CFDE_CSSComputedStyle* pStyle) diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.cpp b/xfa/fxfa/parser/cxfa_scriptcontext.cpp index b33d4efda4..44ae9a4e5a 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.cpp +++ b/xfa/fxfa/parser/cxfa_scriptcontext.cpp @@ -9,10 +9,10 @@ #include <utility> #include "core/fxcrt/fx_ext.h" -#include "third_party/base/ptr_util.h" #include "fxjs/cfxjse_arguments.h" #include "fxjs/cfxjse_class.h" #include "fxjs/cfxjse_value.h" +#include "third_party/base/ptr_util.h" #include "xfa/fxfa/app/xfa_ffnotify.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/parser/cxfa_document.h" |