diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-17 09:19:14 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-17 14:25:41 +0000 |
| commit | 38ce5278ad391b66716425788b45a0bfa2331412 (patch) | |
| tree | 843e1755f525d41bf0a8d6574e02e231f010f8bf | |
| parent | f9068a5c08e55c1c16b14863abd8a089a327bc4d (diff) | |
| download | pdfium-38ce5278ad391b66716425788b45a0bfa2331412.tar.xz | |
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>
| -rw-r--r-- | core/fxge/cfx_font.h | 4 | ||||
| -rw-r--r-- | core/fxge/skia/fx_skia_device.cpp | 4 | ||||
| -rw-r--r-- | core/fxge/skia/fx_skia_device.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h index d9f6debc5f..ecb64e5009 100644 --- a/core/fxge/cfx_font.h +++ b/core/fxge/cfx_font.h @@ -89,6 +89,8 @@ class CFX_Font { 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 @@ class CFX_Font { #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(); diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index 8038ec5de1..6e27ea1775 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -714,7 +714,7 @@ class SkiaState { 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 @@ class SkiaState { 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; diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 7dcf362c66..4423081251 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -156,9 +156,9 @@ class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { 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; |