From 2ca8fcbc8a7a3ef6adfac154c47068c1696205d0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 16 Jun 2015 16:29:44 -0700 Subject: Separate agg-authored code from fx-authored code. Creates a separate library so we can apply less-strict warnings to the code we can't change from upstream vs. the code we can change, reducing noise in the standalone build. Remove needless foo.{cpp,h} files that merely perform indirection via #include "some_other_path/foo.{cpp,h}". BUG=pdfium:166 R=brucedawson@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/1152743007. --- core/src/fxge/agg/include/fx_agg_driver.h | 5 +++-- core/src/fxge/agg/include/fxfx_agg_basics.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_conv_dash.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_conv_stroke.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_curves.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_path_storage.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h | 12 ------------ core/src/fxge/agg/include/fxfx_agg_scanline_u.h | 12 ------------ 11 files changed, 3 insertions(+), 122 deletions(-) delete mode 100644 core/src/fxge/agg/include/fxfx_agg_basics.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_conv_dash.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_conv_stroke.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_curves.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_path_storage.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h delete mode 100644 core/src/fxge/agg/include/fxfx_agg_scanline_u.h (limited to 'core/src/fxge/agg/include') diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index 803227e044..29b56c77e4 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -7,8 +7,9 @@ #ifndef FX_AGG_DRIVER_H_ #define FX_AGG_DRIVER_H_ -#include "fxfx_agg_path_storage.h" -#include "fxfx_agg_rasterizer_scanline_aa.h" +#include "../../../../../third_party/agg23/agg_clip_liang_barsky.h" +#include "../../../../../third_party/agg23/agg_path_storage.h" +#include "../../../../../third_party/agg23/agg_rasterizer_scanline_aa.h" class CAgg_PathData { diff --git a/core/src/fxge/agg/include/fxfx_agg_basics.h b/core/src/fxge/agg/include/fxfx_agg_basics.h deleted file mode 100644 index e27a843bba..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_basics.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_BASICS_H_ -#define FXFX_AGG_BASICS_H_ - -#include "../agg23/agg_basics.h" - -#endif // FXFX_AGG_BASICS_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h deleted file mode 100644 index 2b64bf900a..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_CLIP_LIANG_BARSKY_H_ -#define FXFX_AGG_CLIP_LIANG_BARSKY_H_ - -#include "../agg23/agg_clip_liang_barsky.h" - -#endif // FXFX_AGG_CLIP_LIANG_BARSKY_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h deleted file mode 100644 index fb1e42dae9..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_CONV_DASH_H_ -#define FXFX_AGG_CONV_DASH_H_ - -#include "../agg23/agg_conv_dash.h" - -#endif // FXFX_AGG_CONV_DASH_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h deleted file mode 100644 index 531df5012e..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_CONV_STROKE_H_ -#define FXFX_AGG_CONV_STROKE_H_ - -#include "../agg23/agg_conv_stroke.h" - -#endif // FXFX_AGG_CONV_STROKE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_curves.h b/core/src/fxge/agg/include/fxfx_agg_curves.h deleted file mode 100644 index 1879958eca..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_curves.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_CURVES_H_ -#define FXFX_AGG_CURVES_H_ - -#include "../agg23/agg_curves.h" - -#endif // FXFX_AGG_CURVES_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_path_storage.h b/core/src/fxge/agg/include/fxfx_agg_path_storage.h deleted file mode 100644 index ab7a85bca5..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_path_storage.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_PATH_STORAGE_H_ -#define FXFX_AGG_PATH_STORAGE_H_ - -#include "../agg23/agg_path_storage.h" - -#endif // FXFX_AGG_PATH_STORAGE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h deleted file mode 100644 index a445298f81..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ -#define FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ - -#include "../agg23/agg_rasterizer_scanline_aa.h" - -#endif // FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h deleted file mode 100644 index 1775dabe3e..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_RENDER_SCANLINE_H_ -#define FXFX_AGG_RENDER_SCANLINE_H_ - -#include "../agg23/agg_renderer_scanline.h" - -#endif // FXFX_AGG_RENDER_SCANLINE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h deleted file mode 100644 index 0eb48b84c0..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_RENDERING_BUFFER_H_ -#define FXFX_AGG_RENDERING_BUFFER_H_ - -#include "../agg23/agg_rendering_buffer.h" - -#endif // FXFX_AGG_RENDERING_BUFFER_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h deleted file mode 100644 index c850f621a3..0000000000 --- a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef FXFX_AGG_SCANLINE_U_H_ -#define FXFX_AGG_SCANLINE_U_H_ - -#include "../agg23/agg_scanline_u.h" - -#endif // FXFX_AGG_SCANLINE_U_H_ -- cgit v1.2.3