| Index: core/fxge/ge/cfx_graphstate.cpp | 
| diff --git a/core/fpdfapi/fpdf_page/cpdf_graphstate.cpp b/core/fxge/ge/cfx_graphstate.cpp | 
| similarity index 53% | 
| rename from core/fpdfapi/fpdf_page/cpdf_graphstate.cpp | 
| rename to core/fxge/ge/cfx_graphstate.cpp | 
| index 5a8dbe841a666ec116b7aca45e8f8b055c35b49c..9a6e73810fdb358df2be0fc509bfaafc9473ab10 100644 | 
| --- a/core/fpdfapi/fpdf_page/cpdf_graphstate.cpp | 
| +++ b/core/fxge/ge/cfx_graphstate.cpp | 
| @@ -4,24 +4,24 @@ | 
|  | 
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com | 
|  | 
| -#include "core/fpdfapi/fpdf_page/cpdf_graphstate.h" | 
| +#include "core/fxge/include/cfx_graphstate.h" | 
|  | 
| #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" | 
|  | 
| -CPDF_GraphState::CPDF_GraphState() {} | 
| +CFX_GraphState::CFX_GraphState() {} | 
|  | 
| -CPDF_GraphState::CPDF_GraphState(const CPDF_GraphState& that) | 
| +CFX_GraphState::CFX_GraphState(const CFX_GraphState& that) | 
| : m_Ref(that.m_Ref) {} | 
|  | 
| -CPDF_GraphState::~CPDF_GraphState() {} | 
| +CFX_GraphState::~CFX_GraphState() {} | 
|  | 
| -void CPDF_GraphState::Emplace() { | 
| +void CFX_GraphState::Emplace() { | 
| m_Ref.Emplace(); | 
| } | 
|  | 
| -void CPDF_GraphState::SetLineDash(CPDF_Array* pArray, | 
| -                                  FX_FLOAT phase, | 
| -                                  FX_FLOAT scale) { | 
| +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<int>(pArray->GetCount())); | 
| @@ -29,33 +29,33 @@ void CPDF_GraphState::SetLineDash(CPDF_Array* pArray, | 
| pData->m_DashArray[i] = pArray->GetNumberAt(i) * scale; | 
| } | 
|  | 
| -FX_FLOAT CPDF_GraphState::GetLineWidth() const { | 
| +FX_FLOAT CFX_GraphState::GetLineWidth() const { | 
| return m_Ref.GetObject()->m_LineWidth; | 
| } | 
|  | 
| -void CPDF_GraphState::SetLineWidth(FX_FLOAT width) { | 
| +void CFX_GraphState::SetLineWidth(FX_FLOAT width) { | 
| m_Ref.GetPrivateCopy()->m_LineWidth = width; | 
| } | 
|  | 
| -CFX_GraphStateData::LineCap CPDF_GraphState::GetLineCap() const { | 
| +CFX_GraphStateData::LineCap CFX_GraphState::GetLineCap() const { | 
| return m_Ref.GetObject()->m_LineCap; | 
| } | 
| -void CPDF_GraphState::SetLineCap(CFX_GraphStateData::LineCap cap) { | 
| +void CFX_GraphState::SetLineCap(CFX_GraphStateData::LineCap cap) { | 
| m_Ref.GetPrivateCopy()->m_LineCap = cap; | 
| } | 
|  | 
| -CFX_GraphStateData::LineJoin CPDF_GraphState::GetLineJoin() const { | 
| +CFX_GraphStateData::LineJoin CFX_GraphState::GetLineJoin() const { | 
| return m_Ref.GetObject()->m_LineJoin; | 
| } | 
|  | 
| -void CPDF_GraphState::SetLineJoin(CFX_GraphStateData::LineJoin join) { | 
| +void CFX_GraphState::SetLineJoin(CFX_GraphStateData::LineJoin join) { | 
| m_Ref.GetPrivateCopy()->m_LineJoin = join; | 
| } | 
|  | 
| -FX_FLOAT CPDF_GraphState::GetMiterLimit() const { | 
| +FX_FLOAT CFX_GraphState::GetMiterLimit() const { | 
| return m_Ref.GetObject()->m_MiterLimit; | 
| } | 
|  | 
| -void CPDF_GraphState::SetMiterLimit(FX_FLOAT limit) { | 
| +void CFX_GraphState::SetMiterLimit(FX_FLOAT limit) { | 
| m_Ref.GetPrivateCopy()->m_MiterLimit = limit; | 
| } | 
|  |