summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn1
-rw-r--r--core/fpdfdoc/cpvt_dash.h21
-rw-r--r--core/fpdfdoc/cpvt_generateap.cpp9
-rw-r--r--core/fpdfdoc/cpvt_generateap.h2
4 files changed, 10 insertions, 23 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 57d07fce04..7355dca772 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -353,7 +353,6 @@ static_library("fpdfdoc") {
"core/fpdfdoc/cpdf_variabletext.h",
"core/fpdfdoc/cpdf_viewerpreferences.cpp",
"core/fpdfdoc/cpdf_viewerpreferences.h",
- "core/fpdfdoc/cpvt_dash.h",
"core/fpdfdoc/cpvt_floatrect.h",
"core/fpdfdoc/cpvt_fontmap.cpp",
"core/fpdfdoc/cpvt_fontmap.h",
diff --git a/core/fpdfdoc/cpvt_dash.h b/core/fpdfdoc/cpvt_dash.h
deleted file mode 100644
index f80d104c96..0000000000
--- a/core/fpdfdoc/cpvt_dash.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 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 CORE_FPDFDOC_CPVT_DASH_H_
-#define CORE_FPDFDOC_CPVT_DASH_H_
-
-#include <stdint.h>
-
-struct CPVT_Dash {
- CPVT_Dash(int32_t dash, int32_t gap, int32_t phase)
- : nDash(dash), nGap(gap), nPhase(phase) {}
-
- int32_t nDash;
- int32_t nGap;
- int32_t nPhase;
-};
-
-#endif // CORE_FPDFDOC_CPVT_DASH_H_
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index ac3e7a51a0..34edd0e088 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -29,6 +29,15 @@
#include "core/fpdfdoc/cpvt_word.h"
#include "third_party/base/ptr_util.h"
+struct CPVT_Dash {
+ CPVT_Dash(int32_t dash, int32_t gap, int32_t phase)
+ : nDash(dash), nGap(gap), nPhase(phase) {}
+
+ int32_t nDash;
+ int32_t nGap;
+ int32_t nPhase;
+};
+
namespace {
bool GenerateWidgetAP(CPDF_Document* pDoc,
diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h
index 31962e237b..6f63b10fbc 100644
--- a/core/fpdfdoc/cpvt_generateap.h
+++ b/core/fpdfdoc/cpvt_generateap.h
@@ -11,7 +11,6 @@
#include "core/fpdfdoc/cpdf_defaultappearance.h"
#include "core/fpdfdoc/cpdf_variabletext.h"
-#include "core/fpdfdoc/cpvt_dash.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/fx_system.h"
@@ -19,6 +18,7 @@
class CPDF_Dictionary;
class CPDF_Document;
+struct CPVT_Dash;
class IPVT_FontMap;
struct CPVT_WordRange;