commit 38ce5278ad391b66716425788b45a0bfa2331412
author Dan Sinclair <dsinclair@chromium.org> Tue Oct 17 09:19:14 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Tue Oct 17 14:25:41 2017 +0000
tree 843e1755f525d41bf0a8d6574e02e231f010f8bf
parent f9068a5c08e55c1c16b14863abd8a089a327bc4d

Remove fxge/ friend classes

This CL removes friends from classes in fxge/.

Change-Id: I8180004de3ebf818ed4c8d5256a01c33cd2d880e
Reviewed-on: https://pdfium-review.googlesource.com/16170
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

core/fxge/cfx_font.h

diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h
index d9f6deb..ecb64e5 100644
--- a/core/fxge/cfx_font.h
+++ b/core/fxge/cfx_font.h
@@ -89,6 +89,8 @@
   uint32_t GetSize() const { return m_dwSize; }
   void AdjustMMParams(int glyph_index, int width, int weight) const;
 
+  CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, int dest_width) const;
+
   static const size_t kAngleSkewArraySize = 30;
   static const char s_AngleSkew[kAngleSkewArraySize];
   static const size_t kWeightPowArraySize = 100;
@@ -103,8 +105,6 @@
 #endif  // PDF_ENABLE_XFA
 
  private:
-  friend class CFX_FaceCache;
-  CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, int dest_width) const;
   CFX_FaceCache* GetFaceCache() const;
   void ReleasePlatformResource();
   void DeleteFace();

core/fxge/skia/fx_skia_device.cpp

diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 8038ec5..6e27ea1 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -714,7 +714,7 @@
     if (Accumulator::kText == m_type || drawIndex != m_commandIndex ||
         (Accumulator::kPath == m_type &&
          DrawChanged(pMatrix, pDrawState, fill_color, stroke_color, fill_mode,
-                     blend_type, m_pDriver->m_bGroupKnockout))) {
+                     blend_type, m_pDriver->GetGroupKnockout()))) {
       Flush();
     }
     if (Accumulator::kPath != m_type) {
@@ -729,7 +729,7 @@
       m_fillColor = fill_color;
       m_strokeColor = stroke_color;
       m_blendType = blend_type;
-      m_groupKnockout = m_pDriver->m_bGroupKnockout;
+      m_groupKnockout = m_pDriver->GetGroupKnockout();
       if (pMatrix)
         m_drawMatrix = *pMatrix;
       m_drawIndex = m_commandIndex;

core/fxge/skia/fx_skia_device.h

diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h
index 7dcf362..4423081 100644
--- a/core/fxge/skia/fx_skia_device.h
+++ b/core/fxge/skia/fx_skia_device.h
@@ -156,9 +156,9 @@
   void DebugVerifyBitmapIsPreMultiplied() const;
   void Dump() const;
 
- private:
-  friend class SkiaState;
+  bool GetGroupKnockout() const { return m_bGroupKnockout; }
 
+ private:
   RetainPtr<CFX_DIBitmap> m_pBitmap;
   RetainPtr<CFX_DIBitmap> m_pOriDevice;
   SkCanvas* m_pCanvas;