diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-16 11:59:15 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-16 17:23:01 +0000 |
| commit | e5a637cfb23da32443b345b07f090b65771fa1c9 (patch) | |
| tree | ea02cb54280f727ba8ebe2c6598a76c8208c6fc9 | |
| parent | 8e7f932410732a4f05d2e69e9ff66277f54d1bd7 (diff) | |
| download | pdfium-e5a637cfb23da32443b345b07f090b65771fa1c9.tar.xz | |
Hide CPVT_Dash in CPVT_GenerateAP
The CPVT_Dash struct is only used in CPVT_GenerateAP. This CL moves the
struct definition into the cpp class and removes the cpvt_dash.h file.
Change-Id: I0f0c9279ded1086d47e81f1057d51121d9466974
Reviewed-on: https://pdfium-review.googlesource.com/16050
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | BUILD.gn | 1 | ||||
| -rw-r--r-- | core/fpdfdoc/cpvt_dash.h | 21 | ||||
| -rw-r--r-- | core/fpdfdoc/cpvt_generateap.cpp | 9 | ||||
| -rw-r--r-- | core/fpdfdoc/cpvt_generateap.h | 2 |
4 files changed, 10 insertions, 23 deletions
@@ -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; |