From 7c9f0a11e3dd890aa2ae13d5bb5460951d2111d8 Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 6 Sep 2016 13:02:55 -0700 Subject: Move CPDF_GraphState to CFX_GraphState The FX layer is spying on its private data, so make the job of ref-counting it live in FX as well, instead of up a layer at pdfapi. Pre-cursor to making this private and passing the graph state itself everywhere. Review-Url: https://codereview.chromium.org/2314223002 --- BUILD.gn | 4 +- core/fpdfapi/fpdf_page/cpdf_graphicstates.h | 4 +- core/fpdfapi/fpdf_page/cpdf_graphstate.cpp | 61 ----------------------------- core/fpdfapi/fpdf_page/cpdf_graphstate.h | 44 --------------------- core/fpdfapi/fpdf_render/fpdf_render.cpp | 2 +- core/fxge/ge/cfx_graphstate.cpp | 61 +++++++++++++++++++++++++++++ core/fxge/include/cfx_graphstate.h | 44 +++++++++++++++++++++ 7 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 core/fpdfapi/fpdf_page/cpdf_graphstate.cpp delete mode 100644 core/fpdfapi/fpdf_page/cpdf_graphstate.h create mode 100644 core/fxge/ge/cfx_graphstate.cpp create mode 100644 core/fxge/include/cfx_graphstate.h diff --git a/BUILD.gn b/BUILD.gn index 0553f8b1a8..1223ef63b9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -422,8 +422,6 @@ static_library("fpdfapi") { "core/fpdfapi/fpdf_page/cpdf_generalstate.cpp", "core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp", "core/fpdfapi/fpdf_page/cpdf_graphicstates.h", - "core/fpdfapi/fpdf_page/cpdf_graphstate.cpp", - "core/fpdfapi/fpdf_page/cpdf_graphstate.h", "core/fpdfapi/fpdf_page/cpdf_image.cpp", "core/fpdfapi/fpdf_page/cpdf_imageobject.cpp", "core/fpdfapi/fpdf_page/cpdf_meshstream.cpp", @@ -766,6 +764,7 @@ static_library("fxge") { "core/fxge/ge/cfx_fontmapper.cpp", "core/fxge/ge/cfx_fontmgr.cpp", "core/fxge/ge/cfx_gemodule.cpp", + "core/fxge/ge/cfx_graphstate.cpp", "core/fxge/ge/cfx_graphstatedata.cpp", "core/fxge/ge/cfx_pathdata.cpp", "core/fxge/ge/cfx_renderdevice.cpp", @@ -785,6 +784,7 @@ static_library("fxge") { "core/fxge/include/cfx_fontmgr.h", "core/fxge/include/cfx_fxgedevice.h", "core/fxge/include/cfx_gemodule.h", + "core/fxge/include/cfx_graphstate.h", "core/fxge/include/cfx_graphstatedata.h", "core/fxge/include/cfx_pathdata.h", "core/fxge/include/cfx_renderdevice.h", diff --git a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h index a408bc794b..fb404ffb72 100644 --- a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h +++ b/core/fpdfapi/fpdf_page/cpdf_graphicstates.h @@ -8,10 +8,10 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHICSTATES_H_ #include "core/fpdfapi/fpdf_page/cpdf_colorstate.h" -#include "core/fpdfapi/fpdf_page/cpdf_graphstate.h" #include "core/fpdfapi/fpdf_page/cpdf_textstate.h" #include "core/fpdfapi/fpdf_page/include/cpdf_clippath.h" #include "core/fpdfapi/fpdf_page/include/cpdf_generalstate.h" +#include "core/fxge/include/cfx_graphstate.h" class CPDF_GraphicStates { public: @@ -22,7 +22,7 @@ class CPDF_GraphicStates { void DefaultStates(); CPDF_ClipPath m_ClipPath; - CPDF_GraphState m_GraphState; + CFX_GraphState m_GraphState; CPDF_ColorState m_ColorState; CPDF_TextState m_TextState; CPDF_GeneralState m_GeneralState; diff --git a/core/fpdfapi/fpdf_page/cpdf_graphstate.cpp b/core/fpdfapi/fpdf_page/cpdf_graphstate.cpp deleted file mode 100644 index 5a8dbe841a..0000000000 --- a/core/fpdfapi/fpdf_page/cpdf_graphstate.cpp +++ /dev/null @@ -1,61 +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 - -#include "core/fpdfapi/fpdf_page/cpdf_graphstate.h" - -#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" - -CPDF_GraphState::CPDF_GraphState() {} - -CPDF_GraphState::CPDF_GraphState(const CPDF_GraphState& that) - : m_Ref(that.m_Ref) {} - -CPDF_GraphState::~CPDF_GraphState() {} - -void CPDF_GraphState::Emplace() { - m_Ref.Emplace(); -} - -void CPDF_GraphState::SetLineDash(CPDF_Array* pArray, - FX_FLOAT phase, - FX_FLOAT scale) { - CFX_GraphStateData* pData = m_Ref.GetPrivateCopy(); - pData->m_DashPhase = phase * scale; - pData->SetDashCount(static_cast(pArray->GetCount())); - for (size_t i = 0; i < pArray->GetCount(); i++) - pData->m_DashArray[i] = pArray->GetNumberAt(i) * scale; -} - -FX_FLOAT CPDF_GraphState::GetLineWidth() const { - return m_Ref.GetObject()->m_LineWidth; -} - -void CPDF_GraphState::SetLineWidth(FX_FLOAT width) { - m_Ref.GetPrivateCopy()->m_LineWidth = width; -} - -CFX_GraphStateData::LineCap CPDF_GraphState::GetLineCap() const { - return m_Ref.GetObject()->m_LineCap; -} -void CPDF_GraphState::SetLineCap(CFX_GraphStateData::LineCap cap) { - m_Ref.GetPrivateCopy()->m_LineCap = cap; -} - -CFX_GraphStateData::LineJoin CPDF_GraphState::GetLineJoin() const { - return m_Ref.GetObject()->m_LineJoin; -} - -void CPDF_GraphState::SetLineJoin(CFX_GraphStateData::LineJoin join) { - m_Ref.GetPrivateCopy()->m_LineJoin = join; -} - -FX_FLOAT CPDF_GraphState::GetMiterLimit() const { - return m_Ref.GetObject()->m_MiterLimit; -} - -void CPDF_GraphState::SetMiterLimit(FX_FLOAT limit) { - m_Ref.GetPrivateCopy()->m_MiterLimit = limit; -} diff --git a/core/fpdfapi/fpdf_page/cpdf_graphstate.h b/core/fpdfapi/fpdf_page/cpdf_graphstate.h deleted file mode 100644 index c3e3880f3c..0000000000 --- a/core/fpdfapi/fpdf_page/cpdf_graphstate.h +++ /dev/null @@ -1,44 +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_FPDFAPI_FPDF_PAGE_CPDF_GRAPHSTATE_H_ -#define CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHSTATE_H_ - -#include "core/fxcrt/include/cfx_count_ref.h" -#include "core/fxge/include/cfx_graphstatedata.h" - -class CPDF_Array; - -class CPDF_GraphState { - public: - CPDF_GraphState(); - CPDF_GraphState(const CPDF_GraphState& that); - ~CPDF_GraphState(); - - void Emplace(); - - void SetLineDash(CPDF_Array* pArray, FX_FLOAT phase, FX_FLOAT scale); - - FX_FLOAT GetLineWidth() const; - void SetLineWidth(FX_FLOAT width); - - CFX_GraphStateData::LineCap GetLineCap() const; - void SetLineCap(CFX_GraphStateData::LineCap cap); - - CFX_GraphStateData::LineJoin GetLineJoin() const; - void SetLineJoin(CFX_GraphStateData::LineJoin join); - - FX_FLOAT GetMiterLimit() const; - void SetMiterLimit(FX_FLOAT limit); - - // FIXME(tsepez): remove when all GraphStateData usage gone. - const CFX_GraphStateData* GetObject() const { return m_Ref.GetObject(); } - - private: - CFX_CountRef m_Ref; -}; - -#endif // CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHSTATE_H_ diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index d7c6e2f604..89667f3a23 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -493,7 +493,7 @@ FX_BOOL CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, if (m_pType3Char) FillType |= FX_FILL_TEXT_MODE; - CPDF_GraphState graphState = pPathObj->m_GraphState; + CFX_GraphState graphState = pPathObj->m_GraphState; if (m_Options.m_Flags & RENDER_THINLINE) graphState.SetLineWidth(0); return m_pDevice->DrawPathWithBlend( diff --git a/core/fxge/ge/cfx_graphstate.cpp b/core/fxge/ge/cfx_graphstate.cpp new file mode 100644 index 0000000000..9a6e73810f --- /dev/null +++ b/core/fxge/ge/cfx_graphstate.cpp @@ -0,0 +1,61 @@ +// 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 + +#include "core/fxge/include/cfx_graphstate.h" + +#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" + +CFX_GraphState::CFX_GraphState() {} + +CFX_GraphState::CFX_GraphState(const CFX_GraphState& that) + : m_Ref(that.m_Ref) {} + +CFX_GraphState::~CFX_GraphState() {} + +void CFX_GraphState::Emplace() { + m_Ref.Emplace(); +} + +void CFX_GraphState::SetLineDash(CPDF_Array* pArray, + FX_FLOAT phase, + FX_FLOAT scale) { + CFX_GraphStateData* pData = m_Ref.GetPrivateCopy(); + pData->m_DashPhase = phase * scale; + pData->SetDashCount(static_cast(pArray->GetCount())); + for (size_t i = 0; i < pArray->GetCount(); i++) + pData->m_DashArray[i] = pArray->GetNumberAt(i) * scale; +} + +FX_FLOAT CFX_GraphState::GetLineWidth() const { + return m_Ref.GetObject()->m_LineWidth; +} + +void CFX_GraphState::SetLineWidth(FX_FLOAT width) { + m_Ref.GetPrivateCopy()->m_LineWidth = width; +} + +CFX_GraphStateData::LineCap CFX_GraphState::GetLineCap() const { + return m_Ref.GetObject()->m_LineCap; +} +void CFX_GraphState::SetLineCap(CFX_GraphStateData::LineCap cap) { + m_Ref.GetPrivateCopy()->m_LineCap = cap; +} + +CFX_GraphStateData::LineJoin CFX_GraphState::GetLineJoin() const { + return m_Ref.GetObject()->m_LineJoin; +} + +void CFX_GraphState::SetLineJoin(CFX_GraphStateData::LineJoin join) { + m_Ref.GetPrivateCopy()->m_LineJoin = join; +} + +FX_FLOAT CFX_GraphState::GetMiterLimit() const { + return m_Ref.GetObject()->m_MiterLimit; +} + +void CFX_GraphState::SetMiterLimit(FX_FLOAT limit) { + m_Ref.GetPrivateCopy()->m_MiterLimit = limit; +} diff --git a/core/fxge/include/cfx_graphstate.h b/core/fxge/include/cfx_graphstate.h new file mode 100644 index 0000000000..9470303ac1 --- /dev/null +++ b/core/fxge/include/cfx_graphstate.h @@ -0,0 +1,44 @@ +// 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_FXGE_INCLUDE_CFX_GRAPHSTATE_H_ +#define CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_ + +#include "core/fxcrt/include/cfx_count_ref.h" +#include "core/fxge/include/cfx_graphstatedata.h" + +class CPDF_Array; + +class CFX_GraphState { + public: + CFX_GraphState(); + CFX_GraphState(const CFX_GraphState& that); + ~CFX_GraphState(); + + void Emplace(); + + void SetLineDash(CPDF_Array* pArray, FX_FLOAT phase, FX_FLOAT scale); + + FX_FLOAT GetLineWidth() const; + void SetLineWidth(FX_FLOAT width); + + CFX_GraphStateData::LineCap GetLineCap() const; + void SetLineCap(CFX_GraphStateData::LineCap cap); + + CFX_GraphStateData::LineJoin GetLineJoin() const; + void SetLineJoin(CFX_GraphStateData::LineJoin join); + + FX_FLOAT GetMiterLimit() const; + void SetMiterLimit(FX_FLOAT limit); + + // FIXME(tsepez): remove when all GraphStateData usage gone. + const CFX_GraphStateData* GetObject() const { return m_Ref.GetObject(); } + + private: + CFX_CountRef m_Ref; +}; + +#endif // CORE_FXGE_INCLUDE_CFX_GRAPHSTATE_H_ -- cgit v1.2.3