Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: Source/platform/fonts/win/FontPlatformDataWin.cpp

Issue 205343010: Use FontPlatformDataHarfBuzz.h on Windows (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/win/FontPlatformDataWin.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/win/FontPlatformDataWin.cpp
diff --git a/Source/platform/fonts/win/FontPlatformDataWin.cpp b/Source/platform/fonts/win/FontPlatformDataWin.cpp
index 236689aca3a358e40ea66baacf5e8553fc14ac67..85ad06b60d4b591bc515c42a6843cacdcc0593af 100644
--- a/Source/platform/fonts/win/FontPlatformDataWin.cpp
+++ b/Source/platform/fonts/win/FontPlatformDataWin.cpp
@@ -32,6 +32,7 @@
#include "config.h"
#include "platform/fonts/FontPlatformData.h"
+#include "SkTypeface.h"
#include "platform/LayoutTestSupport.h"
#include "platform/fonts/FontCache.h"
#include "platform/fonts/harfbuzz/HarfBuzzFace.h"
@@ -196,6 +197,10 @@ FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family
m_paintTextFlags = computePaintTextFlags(fontFamilyName());
}
+FontPlatformData::~FontPlatformData()
+{
+}
+
FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
{
if (this != &data) {
@@ -209,10 +214,6 @@ FontPlatformData& FontPlatformData::operator=(const FontPlatformData& data)
return *this;
}
-FontPlatformData::~FontPlatformData()
-{
-}
-
String FontPlatformData::fontFamilyName() const
{
// FIXME: This returns the requested name, perhaps a better solution would be to
@@ -246,6 +247,11 @@ HarfBuzzFace* FontPlatformData::harfBuzzFace() const
return m_harfBuzzFace.get();
}
+SkFontID FontPlatformData::uniqueID() const
+{
+ return m_typeface->uniqueID();
+}
+
bool FontPlatformData::defaultUseSubpixelPositioning()
{
return FontCache::fontCache()->useSubpixelPositioning();
« no previous file with comments | « Source/platform/fonts/win/FontPlatformDataWin.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698