Clean up CFGAS_GEFont

Clean up CFGAS_GEFont

Removed some unused method, named files properly, cleaned up a bit.

Committed: https://pdfium.googlesource.com/pdfium/+/4b91a2dfacee0c0f4068a7ab899c211480712d38

[npm, 2016-11-21 21:06:25]

Description was changed from

==========
Clean up CFGAS_GEFont

Removed some unused method, named files properly, cleaned up a bit.
==========

to

==========
Clean up CFGAS_GEFont

Removed some unused method, named files properly, cleaned up a bit.
==========

[npm, 2016-11-21 21:06:25]

npm@chromium.org changed reviewers:
+ dsinclair@chromium.org, tsepez@chromium.org

[npm, 2016-11-21 21:06:32]

ptal

[dsinclair, 2016-11-21 21:13:56]

lgtm w/ nits.

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_fontmgr...
File xfa/fgas/font/cfgas_fontmgr.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_fontmgr...
xfa/fgas/font/cfgas_fontmgr.cpp:17: #include "xfa/fgas/font/cfgas_gefont.h"
Sort.

https://codereview.chromium.org/2524493002/diff/1/xfa/fwl/theme/cfwl_widgettp...
File xfa/fwl/theme/cfwl_widgettp.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fwl/theme/cfwl_widgettp...
xfa/fwl/theme/cfwl_widgettp.cpp:13: #include "xfa/fgas/font/cfgas_fontmgr.h"
sort

[Tom Sepez, 2016-11-21 21:17:51]

lgtm

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_gefont.cpp
File xfa/fgas/font/cfgas_gefont.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_gefont....
xfa/fgas/font/cfgas_gefont.cpp:269: wsFamily =
CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsStringC());
nit: local not needed, just return CFX_WideString::FromLocal(...); 
nit: having returned, we can skip the else.

[npm, 2016-11-21 21:29:39]

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_fontmgr...
File xfa/fgas/font/cfgas_fontmgr.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_fontmgr...
xfa/fgas/font/cfgas_fontmgr.cpp:17: #include "xfa/fgas/font/cfgas_gefont.h"
On 2016/11/21 21:13:55, dsinclair wrote:
> Sort.

Done.

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_gefont.cpp
File xfa/fgas/font/cfgas_gefont.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fgas/font/cfgas_gefont....
xfa/fgas/font/cfgas_gefont.cpp:269: wsFamily =
CFX_WideString::FromLocal(m_pFont->GetFamilyName().AsStringC());
On 2016/11/21 21:17:51, Tom Sepez wrote:
> nit: local not needed, just return CFX_WideString::FromLocal(...); 
> nit: having returned, we can skip the else.

Done.

https://codereview.chromium.org/2524493002/diff/1/xfa/fwl/theme/cfwl_widgettp...
File xfa/fwl/theme/cfwl_widgettp.cpp (right):

https://codereview.chromium.org/2524493002/diff/1/xfa/fwl/theme/cfwl_widgettp...
xfa/fwl/theme/cfwl_widgettp.cpp:13: #include "xfa/fgas/font/cfgas_fontmgr.h"
On 2016/11/21 21:13:55, dsinclair wrote:
> sort

Done.

[npm, 2016-11-21 21:29:43]

The CQ bit was checked by npm@chromium.org

[npm, 2016-11-21 21:29:44]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
dsinclair@chromium.org
Link to the patchset: https://codereview.chromium.org/2524493002/#ps20001
(title: "Nits")

[commit-bot: I haz the power, 2016-11-21 21:29:54]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-21 22:03:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-11-21 22:03:55]

Failed to apply patch for xfa/fgas/font/cfgas_gefont.h:
While running git apply --index -p1;
  error: patch failed: xfa/fgas/font/fgas_gefont.h:4
  error: xfa/fgas/font/fgas_gefont.h: patch does not apply

Patch:   NR  xfa/fgas/font/fgas_gefont.h->xfa/fgas/font/cfgas_gefont.h
Index: xfa/fgas/font/cfgas_gefont.h
diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
similarity index 94%
rename from xfa/fgas/font/fgas_gefont.h
rename to xfa/fgas/font/cfgas_gefont.h
index
7baafefc7e878957b49fb7bb4eb4718b1d80e6ce..ae704285156720efe03006ffad3fd8b3f4a40b33
100644
--- a/xfa/fgas/font/fgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc.
http://www.foxitsoftware.com
 
-#ifndef XFA_FGAS_FONT_FGAS_GEFONT_H_
-#define XFA_FGAS_FONT_FGAS_GEFONT_H_
+#ifndef XFA_FGAS_FONT_CFGAS_GEFONT_H_
+#define XFA_FGAS_FONT_CFGAS_GEFONT_H_
 
 #include <map>
 
@@ -42,7 +42,6 @@ class CFGAS_GEFont {
   void Release();
   CFGAS_GEFont* Retain();
   CFGAS_GEFont* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0);
-  void GetFamilyName(CFX_WideString& wsFamily) const;
   uint32_t GetFontStyles() const;
   bool GetCharWidth(FX_WCHAR wUnicode, int32_t& iWidth, bool bCharCode);
   int32_t GetGlyphIndex(FX_WCHAR wUnicode, bool bCharCode = false);
@@ -50,8 +49,6 @@ class CFGAS_GEFont {
   int32_t GetDescent() const;
   bool GetCharBBox(FX_WCHAR wUnicode, CFX_Rect& bbox, bool bCharCode = false);
   bool GetBBox(CFX_Rect& bbox);
-  int32_t GetItalicAngle() const;
-  void Reset();
   CFGAS_GEFont* GetSubstFont(int32_t iGlyphIndex) const;
   CFX_Font* GetDevFont() const { return m_pFont; }
   void SetFontProvider(CXFA_PDFFontMgr* pProvider) { m_pProvider = pProvider; }
@@ -62,7 +59,7 @@ class CFGAS_GEFont {
   }
 #endif
 
- protected:
+ private:
   explicit CFGAS_GEFont(CFGAS_FontMgr* pFontMgr);
   CFGAS_GEFont(CFGAS_GEFont* src, uint32_t dwFontStyles);
 
@@ -88,6 +85,7 @@ class CFGAS_GEFont {
                         bool bRecursive,
                         CFGAS_GEFont** ppFont,
                         bool bCharCode = false);
+  CFX_WideString GetFamilyName() const;
 
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
   bool m_bUseLogFontStyle;
@@ -111,4 +109,4 @@ class CFGAS_GEFont {
   std::map<FX_WCHAR, CFGAS_GEFont*> m_FontMapper;
 };
 
-#endif  // XFA_FGAS_FONT_FGAS_GEFONT_H_
+#endif  // XFA_FGAS_FONT_CFGAS_GEFONT_H_

[npm, 2016-11-21 22:13:32]

The CQ bit was checked by npm@chromium.org

[npm, 2016-11-21 22:13:33]

The patchset sent to the CQ was uploaded after l-g-t-m from tsepez@chromium.org,
dsinclair@chromium.org
Link to the patchset: https://codereview.chromium.org/2524493002/#ps40001
(title: "Rebase?")

[commit-bot: I haz the power, 2016-11-21 22:13:39]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-11-21 23:19:44]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1479766412550780,
"parent_rev": "4ccdb1459239ae044f01c8b6799852f8b63acb80", "commit_rev":
"4b91a2dfacee0c0f4068a7ab899c211480712d38"}

[commit-bot: I haz the power, 2016-11-21 23:19:47]

Description was changed from

==========
Clean up CFGAS_GEFont

Removed some unused method, named files properly, cleaned up a bit.
==========

to

==========
Clean up CFGAS_GEFont

Removed some unused method, named files properly, cleaned up a bit.

Committed:
https://pdfium.googlesource.com/pdfium/+/4b91a2dfacee0c0f4068a7ab899c21148071...
==========

[commit-bot: I haz the power, 2016-11-21 23:19:48]

Committed patchset #3 (id:40001) as
https://pdfium.googlesource.com/pdfium/+/4b91a2dfacee0c0f4068a7ab899c21148071...