Fix relative includes within core/

core/src/fxge/skia/fx_skia_device.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // 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_

[Tom Sepez, 2015/11/09 21:46:16]

nit: remove.

[Lei Zhang, 2015/11/10 09:27:56]

Done.

 #if defined(_SKIA_SUPPORT_)
-#include "../../../include/fxcodec/fx_codec.h"
+#include "core/include/fxcodec/fx_codec.h"
 
 //#define _FOXIT_DEBUG_

[Tom Sepez, 2015/11/09 21:46:16]

nitto.

[Lei Zhang, 2015/11/10 09:27:56]

Done.

 //#define _FOXIT_BENCHMARK_

[Tom Sepez, 2015/11/09 21:46:16]

ditto nitto.

[Lei Zhang, 2015/11/10 09:27:56]

Done.

 
 extern "C" {
 extern void FX_OUTPUT_LOG_FUNC(const char*, ...);
 extern int FX_GET_TICK_FUNC();
 };
 
 #ifdef _FOXIT_DEBUG_
 #define FOXIT_DEBUG1(msg) FX_OUTPUT_LOG_FUNC(msg)
 #define FOXIT_DEBUG2(msg, para) FX_OUTPUT_LOG_FUNC(msg, para)
 #define FOXIT_DEBUG3(msg, para1, para2) FX_OUTPUT_LOG_FUNC(msg, para1, para2)
 #define FOXIT_DEBUG4(msg, para1, para2, para3) \
   FX_OUTPUT_LOG_FUNC(msg, para1, para2, para3)
 #define FOXIT_DEBUG5(msg, para1, para2, para3, param4) \
   FX_OUTPUT_LOG_FUNC(msg, para1, para2, para3, param4)
 #else
 #define FOXIT_DEBUG1(msg)
 #define FOXIT_DEBUG2(msg, para)
 #define FOXIT_DEBUG3(msg, para1, para2)
 #define FOXIT_DEBUG4(msg, para1, para2, para3)
 #define FOXIT_DEBUG5(msg, para1, para2, para3, param4)
 #endif
 
 #include "SkDashPathEffect.h"

[Tom Sepez, 2015/11/09 21:46:16]

move these up top.

[Lei Zhang, 2015/11/10 09:27:56]

Done.

 #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 "../agg/fx_agg_driver.h"
 #include "fx_skia_device.h"
+
 /// Run-length-encoded supersampling antialiased blitter.
 class SuperBlitter_skia {
  public:
   static void DrawPath(const SkPath& srcPath,
                        SkBlitter* blitter,
                        const SkRasterClip& rect,
                        const SkPaint& origPaint);
 };
 FX_BOOL FxSkDrawTreatAsHairline(const SkPaint& paint, SkScalar* coverage) {
   if (SkPaint::kStroke_Style != paint.getStyle())
@@ skipping 567 matching lines @@
       new CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
   SetDeviceDriver(pDriver);
   return TRUE;
 }
 CFX_SkiaDevice::~CFX_SkiaDevice() {
   if (m_bOwnedBitmap && GetBitmap())
     delete GetBitmap();
 }
 
 #endif