diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-29 23:53:53 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-29 23:53:53 +0000 |
| commit | 20c41a5a47b2460277897a1059789fc9e184e3ab (patch) | |
| tree | a60b9695de7242be833c4119bb9815bd39b297ca /core/fxge/apple | |
| parent | 8020fd856805ed5c5f48a7a5f3a346ea6948355f (diff) | |
| download | pdfium-20c41a5a47b2460277897a1059789fc9e184e3ab.tar.xz | |
Use pdfium::span<>/UnownedPtr in CFX_Font.
Move some platform-specific ifdefs so the come last in each
section as it is easier to read, perhaps.
Change-Id: Ic1c2652c46ecebc63b66213735ed6d94737a7f32
Reviewed-on: https://pdfium-review.googlesource.com/41630
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/apple')
| -rw-r--r-- | core/fxge/apple/fx_apple_platform.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index cafe44730c..aad97ee4cb 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -20,6 +20,7 @@ #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_freetype.h" +#include "third_party/base/span.h" #ifndef _SKIA_SUPPORT_ @@ -52,8 +53,8 @@ bool CGDrawGlyphRun(CGContextRef pContext, if (pFont->GetPsName() == "DFHeiStd-W5") return false; - pFont->SetPlatformFont( - quartz2d.CreateFont(pFont->GetFontData(), pFont->GetSize())); + pdfium::span<const uint8_t> span = pFont->GetFontSpan(); + pFont->SetPlatformFont(quartz2d.CreateFont(span.data(), span.size())); if (!pFont->GetPlatformFont()) return false; } |