Move core/include/fpdfapi/fpdf_pageobj.h into core/fpdfapi.

core/fpdfapi/fpdf_page/cpdf_textstate.h

+// 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_TEXTSTATE_H_
+#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
+
+#include "core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h"
+#include "core/include/fxcrt/fx_basic.h"
+
+class CPDF_Font;
+
+class CPDF_TextState : public CFX_CountRef<CPDF_TextStateData> {

[Tom Sepez, 2016/03/17 20:15:38]

It dawns on me that it might be OK to put the CPDF_XXXXXData and the CPDF_XXXXX
in the same file, to prevent flipping back and forth a lot ... HMM.

[dsinclair, 2016/03/17 20:37:41]

Do we know why these are separated? Seems like the direction in the long run
would be to fold the CPDF_XXXData classes back into the CPDF_XXX classes and
remove the CPDF_XXXData, yea? If that seems sane, can file a followup bug.

[Tom Sepez, 2016/03/18 16:21:57]

They're separate because of inconsistency with the ownership model.  Sometimes
they are (externally) refcounted, sometimes they aren't and are just used
directly. I much prefer the case where the refcount is in the object, rather
than going throguh this layer of indirection, which would be the "folding
together" you propose. But there are places where callers just blatantly  set
the m_pObject to null, and count on this then acting as a kind of weak ptr.

+ public:
+  CPDF_Font* GetFont() const { return m_pObject->m_pFont; }
+  void SetFont(CPDF_Font* pFont);
+
+  FX_FLOAT GetFontSize() const { return m_pObject->m_FontSize; }
+  FX_FLOAT* GetMatrix() const { return m_pObject->m_Matrix; }
+  FX_FLOAT GetFontSizeV() const;
+  FX_FLOAT GetFontSizeH() const;
+  FX_FLOAT GetBaselineAngle() const;
+  FX_FLOAT GetShearAngle() const;
+};
+
+#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_