summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fxge/apple/fx_apple_platform.cpp28
-rw-r--r--skia/BUILD.gn2
2 files changed, 20 insertions, 10 deletions
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index 3bddf64280..c7e81d5339 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -19,6 +19,8 @@
#include "core/fxge/include/fx_freetype.h"
#include "core/fxge/include/fx_ge_apple.h"
+#ifndef _SKIA_SUPPORT_
+
namespace {
void DoNothing(void* info, const void* data, size_t size) {}
@@ -86,6 +88,7 @@ void CFX_AggDeviceDriver::InitPlatform() {
->m_quartz2d;
m_pPlatformGraphics = quartz2d.createGraphics(m_pBitmap);
}
+
void CFX_AggDeviceDriver::DestroyPlatform() {
CQuartz2D& quartz2d =
static_cast<CApplePlatform*>(CFX_GEModule::Get()->GetPlatformData())
@@ -95,16 +98,6 @@ void CFX_AggDeviceDriver::DestroyPlatform() {
m_pPlatformGraphics = nullptr;
}
}
-void CFX_FaceCache::InitPlatform() {}
-void CFX_FaceCache::DestroyPlatform() {}
-CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext(
- CFX_Font* pFont,
- uint32_t glyph_index,
- const CFX_Matrix* pMatrix,
- int dest_width,
- int anti_alias) {
- return nullptr;
-}
FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars,
const FXTEXT_CHARPOS* pCharPos,
@@ -166,6 +159,21 @@ FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars,
return ret;
}
+#endif // _SKIA_SUPPORT_
+
+void CFX_FaceCache::InitPlatform() {}
+
+void CFX_FaceCache::DestroyPlatform() {}
+
+CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext(
+ CFX_Font* pFont,
+ uint32_t glyph_index,
+ const CFX_Matrix* pMatrix,
+ int dest_width,
+ int anti_alias) {
+ return nullptr;
+}
+
void CFX_Font::ReleasePlatformResource() {
if (m_pPlatformFont) {
CQuartz2D& quartz2d =
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index e12129153f..c5c2796f9c 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -338,6 +338,8 @@ component("skia") {
sources -= [
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+ "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+ "//third_party/skia/src/ports/SkFontMgr_custom_empty_factory.cpp",
]
}