summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-09-29 13:43:30 -0700
committerCommit bot <commit-bot@chromium.org>2016-09-29 13:43:30 -0700
commit8a4e286e686c3027f382afb07d3ddcec4610fdd9 (patch)
treec693cffa5f7969110c4b6b969120e794fe6bbfd7 /xfa/fxfa
parente0307861b8e55c9f44e947d8bf82b9c16ec9b963 (diff)
downloadpdfium-8a4e286e686c3027f382afb07d3ddcec4610fdd9.tar.xz
Move core/fxcodec/codec/include and core/fxcodec/include files up
BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2381063002
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/app/DEPS4
-rw-r--r--xfa/fxfa/app/xfa_ffwidget.cpp4
-rw-r--r--xfa/fxfa/include/DEPS2
-rw-r--r--xfa/fxfa/include/xfa_ffwidget.h2
-rw-r--r--xfa/fxfa/parser/DEPS2
-rw-r--r--xfa/fxfa/parser/xfa_localemgr.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS
index abdf53d98f..fed4e8526d 100644
--- a/xfa/fxfa/app/DEPS
+++ b/xfa/fxfa/app/DEPS
@@ -4,6 +4,6 @@ include_rules = [
'+core/fpdfapi/fpdf_page',
'+core/fpdfapi/fpdf_parser',
'+core/fpdfdoc',
- '+core/fxcodec/include',
- '+core/fxcodec/codec/include',
+ '+core/fxcodec',
+ '+core/fxcodec/codec',
]
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 2ef9840c1a..31cbf25928 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -10,8 +10,8 @@
#include <memory>
#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
-#include "core/fxcodec/codec/include/ccodec_progressivedecoder.h"
-#include "core/fxcodec/include/fx_codec.h"
+#include "core/fxcodec/codec/ccodec_progressivedecoder.h"
+#include "core/fxcodec/fx_codec.h"
#include "core/fxge/include/cfx_gemodule.h"
#include "core/fxge/include/cfx_pathdata.h"
#include "core/fxge/include/cfx_renderdevice.h"
diff --git a/xfa/fxfa/include/DEPS b/xfa/fxfa/include/DEPS
index 97ccb1faa6..1519ceaa93 100644
--- a/xfa/fxfa/include/DEPS
+++ b/xfa/fxfa/include/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- '+core/fxcodec/include',
+ '+core/fxcodec',
]
diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h
index ca325ee33d..7b6130f09b 100644
--- a/xfa/fxfa/include/xfa_ffwidget.h
+++ b/xfa/fxfa/include/xfa_ffwidget.h
@@ -9,7 +9,7 @@
#include <vector>
-#include "core/fxcodec/include/fx_codec_def.h"
+#include "core/fxcodec/fx_codec_def.h"
#include "core/fxge/include/cfx_graphstatedata.h"
#include "xfa/fxfa/include/fxfa.h"
#include "xfa/fxfa/parser/cxfa_contentlayoutitem.h"
diff --git a/xfa/fxfa/parser/DEPS b/xfa/fxfa/parser/DEPS
index 97ccb1faa6..1519ceaa93 100644
--- a/xfa/fxfa/parser/DEPS
+++ b/xfa/fxfa/parser/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- '+core/fxcodec/include',
+ '+core/fxcodec',
]
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index 94a2f5a3f6..9b444defee 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -9,7 +9,7 @@
#include <memory>
#include <utility>
-#include "core/fxcodec/include/fx_codec.h"
+#include "core/fxcodec/fx_codec.h"
#include "core/fxcrt/include/fx_xml.h"
#include "core/fxge/include/cfx_gemodule.h"
#include "xfa/fxfa/parser/cxfa_document.h"