Chromium Code Reviews

Unified Diff: Source/platform/fonts/mac/FontCacheMac.mm

Issue 1021483004: Revert of Remove Mac native font type members from FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « Source/platform/fonts/SimpleFontData.h ('k') | Source/platform/fonts/mac/FontCustomPlatformDataMac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/mac/FontCacheMac.mm
diff --git a/Source/platform/fonts/mac/FontCacheMac.mm b/Source/platform/fonts/mac/FontCacheMac.mm
index 14ac4e6ab7dea82b34f99dc4c7e997bc99e0faf2..0b54574eb1041d324b4bb2c221a4fb37e30a6be1 100644
--- a/Source/platform/fonts/mac/FontCacheMac.mm
+++ b/Source/platform/fonts/mac/FontCacheMac.mm
@@ -31,18 +31,18 @@
#import "platform/fonts/FontCache.h"
#import <AppKit/AppKit.h>
-#include "platform/LayoutTestSupport.h"
-#include "platform/RuntimeEnabledFeatures.h"
-#include "platform/fonts/FontDescription.h"
-#include "platform/fonts/FontFaceCreationParams.h"
-#include "platform/fonts/FontPlatformData.h"
-#include "platform/fonts/SimpleFontData.h"
-#include "platform/fonts/mac/FontFamilyMatcherMac.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebTraceLocation.h"
-#include <wtf/Functional.h>
-#include <wtf/MainThread.h>
-#include <wtf/StdLibExtras.h>
+#import "platform/LayoutTestSupport.h"
+#import "platform/RuntimeEnabledFeatures.h"
+#import "platform/fonts/FontDescription.h"
+#import "platform/fonts/FontFaceCreationParams.h"
+#import "platform/fonts/FontPlatformData.h"
+#import "platform/fonts/SimpleFontData.h"
+#import "platform/fonts/mac/FontFamilyMatcherMac.h"
+#import "public/platform/Platform.h"
+#import "public/platform/WebTraceLocation.h"
+#import <wtf/Functional.h>
+#import <wtf/MainThread.h>
+#import <wtf/StdLibExtras.h>
// Forward declare Mac SPIs.
// Request for public API: rdar://13803570
@@ -119,7 +119,7 @@
}
const FontPlatformData& platformData = fontDataToSubstitute->platformData();
- NSFont* nsFont = toNSFont(platformData.ctFont());
+ NSFont *nsFont = platformData.font();
NSString *string = [[NSString alloc] initWithCharactersNoCopy:codeUnits length:codeUnitsLength freeWhenDone:NO];
NSFont *substituteFont = [NSFont findFontLike:nsFont forString:string withRange:NSMakeRange(0, codeUnitsLength) inLanguage:nil];
@@ -220,14 +220,11 @@
bool syntheticBold = (isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(actualWeight)) || fontDescription.isSyntheticBold();
bool syntheticItalic = ((traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait)) || fontDescription.isSyntheticItalic();
- // FontPlatformData::typeface() is null in the case of Chromium out-of-process font loading failing.
- // Out-of-process loading occurs for registered fonts stored in non-system locations.
- // When loading fails, we do not want to use the returned FontPlatformData since it will not have
- // a valid SkTypeface.
+ // FontPlatformData::font() can be null for the case of Chromium out-of-process font loading.
+ // In that case, we don't want to use the platformData.
OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platformFont, size, syntheticBold, syntheticItalic, fontDescription.orientation()));
- if (!platformData->typeface()) {
- return nullptr;
- }
+ if (!platformData->font())
+ return 0;
return platformData.leakPtr();
}
« no previous file with comments | « Source/platform/fonts/SimpleFontData.h ('k') | Source/platform/fonts/mac/FontCustomPlatformDataMac.cpp » ('j') | no next file with comments »

Powered by Google App Engine