summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-04-06 12:30:31 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-06 12:30:32 -0700
commit86e5474dc4ff7fe0d0850f26f7320e1e57f3fd21 (patch)
tree38e8d16226cbf0e58c6c242c8954e8e45a4819cd /core/fxge
parent088632c37b21cbf3a4668b6094bd04ede021f15e (diff)
downloadpdfium-86e5474dc4ff7fe0d0850f26f7320e1e57f3fd21.tar.xz
Move include/fxcodec to fxcodec/include
Review URL: https://codereview.chromium.org/1864153002
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp2
-rw-r--r--core/fxge/dib/fx_dib_composite.cpp2
-rw-r--r--core/fxge/dib/fx_dib_convert.cpp2
-rw-r--r--core/fxge/dib/fx_dib_main.cpp2
-rw-r--r--core/fxge/ge/fx_ge_ps.cpp2
-rw-r--r--core/fxge/ge/fx_ge_text.cpp2
-rw-r--r--core/fxge/skia/fx_skia_device.cpp2
-rw-r--r--core/fxge/win32/fx_win32_device.cpp2
8 files changed, 8 insertions, 8 deletions
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 62fb539239..811e65c4e9 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -8,10 +8,10 @@
#include <algorithm>
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/fx_text_int.h"
#include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
#include "third_party/agg23/agg_conv_dash.h"
#include "third_party/agg23/agg_conv_stroke.h"
#include "third_party/agg23/agg_curves.h"
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index 8b0b97c049..a9a3039ef7 100644
--- a/core/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
const uint8_t _color_sqrt[256] = {
0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26,
diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index 5ed655afe2..7484620b8f 100644
--- a/core/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
@@ -4,9 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/include/fx_dib.h"
#include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
class CFX_Palette {
public:
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 3c500ecb53..4503fd506f 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -8,9 +8,9 @@
#include <limits.h>
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
uint8_t* dest_buf,
diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index 0d8ccbf566..b4e9ed918a 100644
--- a/core/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -6,8 +6,8 @@
#include "core/fxge/include/fx_ge.h"
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/ge/fx_text_int.h"
-#include "core/include/fxcodec/fx_codec.h"
struct PSGlyph {
CFX_Font* m_pFont;
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 78d1c15687..8d6fecf7a1 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -4,10 +4,10 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/ge/fx_text_int.h"
#include "core/fxge/include/fx_freetype.h"
#include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
#ifdef _SKIA_SUPPORT_
#include "third_party/skia/include/core/SkStream.h"
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 1f8f086b2b..ba671c2511 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -5,7 +5,7 @@
#include "core/fxge/include/fx_ge.h"
#if defined(_SKIA_SUPPORT_)
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
#include "core/fpdfapi/fpdf_page/pageint.h"
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index bfcda1547c..f83ac3277c 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -9,6 +9,7 @@
#if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
#include <crtdbg.h>
+#include "core/fxcodec/include/fx_codec.h"
#include "core/fxge/agg/fx_agg_driver.h"
#include "core/fxge/dib/dib_int.h"
#include "core/fxge/ge/fx_text_int.h"
@@ -16,7 +17,6 @@
#include "core/fxge/include/fx_ge_win32.h"
#include "core/fxge/win32/dwrite_int.h"
#include "core/fxge/win32/win32_int.h"
-#include "core/include/fxcodec/fx_codec.h"
#include "third_party/base/stl_util.h"
class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo {