From bde53d25de8cba5657aa7f63a301288663fa58e5 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 12 Nov 2015 22:21:30 -0800
Subject: Merge to XFA: Remove relative includes.

That refer to parent directories.

TBR=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1434223002 .

(cherry picked from commit 22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228)

Review URL: https://codereview.chromium.org/1439223003 .
---
 core/src/fxge/agg/src/fx_agg_driver.cpp   | 4 ++--
 core/src/fxge/apple/fx_apple_platform.cpp | 4 ++--
 core/src/fxge/apple/fx_quartz_device.cpp  | 4 ++--
 core/src/fxge/ge/fx_ge_fontmap.cpp        | 2 +-
 core/src/fxge/win32/fx_win32_device.cpp   | 4 ++--
 core/src/fxge/win32/fx_win32_print.cpp    | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'core/src/fxge')

diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp
index 5b5100bcc5..78186a8f96 100644
--- a/core/src/fxge/agg/src/fx_agg_driver.cpp
+++ b/core/src/fxge/agg/src/fx_agg_driver.cpp
@@ -6,10 +6,10 @@
 
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
 
-#include "../../dib/dib_int.h"
-#include "../../ge/text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.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/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp
index c289b93041..8346873408 100644
--- a/core/src/fxge/apple/fx_apple_platform.cpp
+++ b/core/src/fxge/apple/fx_apple_platform.cpp
@@ -9,12 +9,12 @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
 #include "apple_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_apple.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
 
 void CFX_AggDeviceDriver::InitPlatform() {
   CQuartz2D& quartz2d =
diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp
index 67b438fc28..e933695a86 100644
--- a/core/src/fxge/apple/fx_quartz_device.cpp
+++ b/core/src/fxge/apple/fx_quartz_device.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 #include "apple_int.h"
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index edfce47c35..c41f448e89 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -6,9 +6,9 @@
 
 #include <limits>
 
-#include "../fontdata/chromefontdata/chromefontdata.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
+#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 #include "text_int.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index 696e5f0179..b7b625341e 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -9,12 +9,12 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
 
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_win32.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
 #include "dwrite_int.h"
 #include "win32_int.h"
 
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
index 4f17274a21..cb7b590f7c 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/src/fxge/win32/fx_win32_print.cpp
@@ -10,10 +10,10 @@
 
 #include <windows.h>
 
-#include "../dib/dib_int.h"
-#include "../ge/text_int.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge_win32.h"
+#include "core/src/fxge/dib/dib_int.h"
+#include "core/src/fxge/ge/text_int.h"
 #include "win32_int.h"
 
 #define SIZETHRESHOLD 1000
-- 
cgit v1.2.3