summaryrefslogtreecommitdiff
path: root/core/src/fxge/skia
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-11-10 09:45:32 -0800
committerLei Zhang <thestig@chromium.org>2015-11-10 09:45:32 -0800
commita9fa50f723654c4e8b26909bb686eaa3721df155 (patch)
treedc6b8bc03ed574872a84120d482ab7196ec1cc54 /core/src/fxge/skia
parentd88a364c1c79b294b980c20ebc9356ea42635bff (diff)
downloadpdfium-a9fa50f723654c4e8b26909bb686eaa3721df155.tar.xz
Merge to XFA: Fix relative includes within core/
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1427633010 . (cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8) Review URL: https://codereview.chromium.org/1438573002 .
Diffstat (limited to 'core/src/fxge/skia')
-rw-r--r--core/src/fxge/skia/fx_skia_blitter_new.cpp6
-rw-r--r--core/src/fxge/skia/fx_skia_device.cpp26
2 files changed, 16 insertions, 16 deletions
diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp
index a3ed75b9cb..ed7b1c74bf 100644
--- a/core/src/fxge/skia/fx_skia_blitter_new.cpp
+++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../include/fxge/fx_ge.h"
+#include "core/include/fxge/fx_ge.h"
+
//#define _SKIA_SUPPORT_
#if defined(_SKIA_SUPPORT_)
-#include "../../../include/fxcodec/fx_codec.h"
#include "SkBlitter.h"
+#include "core/include/fxcodec/fx_codec.h"
#include "fx_skia_blitter_new.h"
+
// We use our own renderer here to make it simple
void CFX_SkiaRenderer::blitAntiH(int x,
int y,
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp
index fcd8e9871e..7cce7b3326 100644
--- a/core/src/fxge/skia/fx_skia_device.cpp
+++ b/core/src/fxge/skia/fx_skia_device.cpp
@@ -2,13 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "../../../include/fxge/fx_ge.h"
-//#define _SKIA_SUPPORT_
+#include "core/include/fxge/fx_ge.h"
+
#if defined(_SKIA_SUPPORT_)
-#include "../../../include/fxcodec/fx_codec.h"
+#include "core/include/fxcodec/fx_codec.h"
-//#define _FOXIT_DEBUG_
-//#define _FOXIT_BENCHMARK_
+#include "SkDashPathEffect.h"
+#include "SkTLazy.h"
+#include "SkScan.h"
+#include "SkRasterClip.h"
+#include "SkStroke.h"
+
+#include "core/src/fxge/agg/include/fx_agg_driver.h"
+#include "fx_skia_blitter_new.h"
+#include "fx_skia_device.h"
extern "C" {
extern void FX_OUTPUT_LOG_FUNC(const char*, ...);
@@ -31,15 +38,6 @@ extern int FX_GET_TICK_FUNC();
#define FOXIT_DEBUG5(msg, para1, para2, para3, param4)
#endif
-#include "SkDashPathEffect.h"
-#include "SkTLazy.h"
-#include "SkScan.h"
-#include "SkRasterClip.h"
-#include "SkStroke.h"
-
-#include "fx_skia_blitter_new.h"
-#include "../agg/fx_agg_driver.h"
-#include "fx_skia_device.h"
/// Run-length-encoded supersampling antialiased blitter.
class SuperBlitter_skia {
public: