Move CPDF_Transparency from fpdfapi/render to fpdfapi/page. The CPDF_PageObjectHolder needs this for some reason, and the class itself is small enough that it can drop down a level thus removing an illegal include. Change-Id: Ib715d97f6190a20501d396c448cce00234966c28 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/55716 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn index 10384d7..6a79428 100644 --- a/core/fpdfapi/page/BUILD.gn +++ b/core/fpdfapi/page/BUILD.gn
@@ -89,6 +89,8 @@ "cpdf_textstate.h", "cpdf_tilingpattern.cpp", "cpdf_tilingpattern.h", + "cpdf_transparency.cpp", + "cpdf_transparency.h", "ipdf_page.h", ] configs += [ "../../../:pdfium_core_config" ]
diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h index e75fd4e..9194224 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.h +++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -13,7 +13,7 @@ #include <set> #include <vector> -#include "core/fpdfapi/render/cpdf_transparency.h" +#include "core/fpdfapi/page/cpdf_transparency.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h"
diff --git a/core/fpdfapi/render/cpdf_transparency.cpp b/core/fpdfapi/page/cpdf_transparency.cpp similarity index 84% rename from core/fpdfapi/render/cpdf_transparency.cpp rename to core/fpdfapi/page/cpdf_transparency.cpp index b85da3d..f9be541 100644 --- a/core/fpdfapi/render/cpdf_transparency.cpp +++ b/core/fpdfapi/page/cpdf_transparency.cpp
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fpdfapi/render/cpdf_transparency.h" +#include "core/fpdfapi/page/cpdf_transparency.h" CPDF_Transparency::CPDF_Transparency() = default;
diff --git a/core/fpdfapi/render/cpdf_transparency.h b/core/fpdfapi/page/cpdf_transparency.h similarity index 77% rename from core/fpdfapi/render/cpdf_transparency.h rename to core/fpdfapi/page/cpdf_transparency.h index 92f7c83..6d4972d 100644 --- a/core/fpdfapi/render/cpdf_transparency.h +++ b/core/fpdfapi/page/cpdf_transparency.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CORE_FPDFAPI_RENDER_CPDF_TRANSPARENCY_H_ -#define CORE_FPDFAPI_RENDER_CPDF_TRANSPARENCY_H_ +#ifndef CORE_FPDFAPI_PAGE_CPDF_TRANSPARENCY_H_ +#define CORE_FPDFAPI_PAGE_CPDF_TRANSPARENCY_H_ class CPDF_Transparency { public: @@ -22,4 +22,4 @@ bool m_bIsolated = false; }; -#endif // CORE_FPDFAPI_RENDER_CPDF_TRANSPARENCY_H_ +#endif // CORE_FPDFAPI_PAGE_CPDF_TRANSPARENCY_H_
diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn index 601ec25..0a404a4 100644 --- a/core/fpdfapi/render/BUILD.gn +++ b/core/fpdfapi/render/BUILD.gn
@@ -42,8 +42,6 @@ "cpdf_textrenderer.h", "cpdf_transferfunc.cpp", "cpdf_transferfunc.h", - "cpdf_transparency.cpp", - "cpdf_transparency.h", "cpdf_type3cache.cpp", "cpdf_type3cache.h", "cpdf_type3glyphs.cpp",
diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h index 1839316..04af878 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.h +++ b/core/fpdfapi/render/cpdf_renderstatus.h
@@ -12,8 +12,8 @@ #include "core/fpdfapi/page/cpdf_clippath.h" #include "core/fpdfapi/page/cpdf_graphicstates.h" +#include "core/fpdfapi/page/cpdf_transparency.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" -#include "core/fpdfapi/render/cpdf_transparency.h" #include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h"