Diff
Modified: trunk/LayoutTests/ChangeLog (218613 => 218614)
--- trunk/LayoutTests/ChangeLog 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/LayoutTests/ChangeLog 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1,3 +1,15 @@
+2017-06-20 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r218524.
+
+ This change broke internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] The system Japanese font cannot be italicized"
+ https://bugs.webkit.org/show_bug.cgi?id=173300
+ http://trac.webkit.org/changeset/218524
+
2017-06-20 Simon Fraser <[email protected]>
<rdar://problem/32862652> [REGRESSION] r218374: fast/events/ios/rotation/layout-viewport-during-safari-type-rotation.html
Deleted: trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic-expected-mismatch.html (218613 => 218614)
--- trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic-expected-mismatch.html 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic-expected-mismatch.html 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-This test makes sure that the Japanese system font can be italicized. The test passes if the character below is oblique (either because the font supports it or because WebKit synthesizes the oblique).
-<div style="font: 100px 'system-ui';">の</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic.html (218613 => 218614)
--- trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic.html 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/LayoutTests/fast/text/system-font-japanese-synthetic-italic.html 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-This test makes sure that the Japanese system font can be italicized. The test passes if the character below is oblique (either because the font supports it or because WebKit synthesizes the oblique).
-<div style="font: 100px 'system-ui'; font-style: italic;">の</div>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (218613 => 218614)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1605,4 +1605,3 @@
webkit.org/b/173487 imported/w3c/web-platform-tests/IndexedDB/large-nested-cloning.html [ Pass Failure ]
-webkit.org/b/313156 [ ElCapitan ] fast/text/system-font-japanese-synthetic-italic.html [ ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (218613 => 218614)
--- trunk/Source/WebCore/ChangeLog 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/Source/WebCore/ChangeLog 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1,3 +1,15 @@
+2017-06-20 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r218524.
+
+ This change broke internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] The system Japanese font cannot be italicized"
+ https://bugs.webkit.org/show_bug.cgi?id=173300
+ http://trac.webkit.org/changeset/218524
+
2017-06-20 Daniel Bates <[email protected]>
Have FrameLoadRequest takes a Frame& instead of a Frame*
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (218613 => 218614)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-06-20 23:22:16 UTC (rev 218614)
@@ -1292,12 +1292,7 @@
#endif
CFIndex coveredLength = 0;
- RetainPtr<CTFontRef> result;
-#if USE_PLATFORM_SYSTEM_FALLBACK_LIST || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200)
- result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
-#else
- result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
-#endif
+ auto result = adoptCF(CTFontCreateForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
#if PLATFORM(IOS)
// Callers of this function won't include multiple code points. "Length" is to know how many code units
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp (218613 => 218614)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2017-06-20 22:57:50 UTC (rev 218613)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp 2017-06-20 23:22:16 UTC (rev 218614)
@@ -28,14 +28,8 @@
#include "FontCache.h"
#include "FontSelector.h"
-#include "SoftLinking.h"
#include <CoreText/CoreText.h>
-#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
-SOFT_LINK_FRAMEWORK(CoreText);
-SOFT_LINK_MAY_FAIL(CoreText, CTFontCopyPhysicalFont, CTFontRef, (CTFontRef font), (font));
-#endif
-
namespace WebCore {
FontFamilySpecificationCoreText::FontFamilySpecificationCoreText(CTFontDescriptorRef fontDescriptor)
@@ -53,18 +47,10 @@
auto font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
- auto fontForSynthesisComputation = font;
-#if USE_PLATFORM_SYSTEM_FALLBACK_LIST
- if (canLoadCTFontCopyPhysicalFont()) {
- if (auto physicalFont = adoptCF(CTFontCopyPhysicalFont(font.get())))
- fontForSynthesisComputation = physicalFont;
- }
-#endif
-
font = preparePlatformFont(font.get(), fontDescription, nullptr, nullptr, { }, fontDescription.computedSize());
bool syntheticBold, syntheticOblique;
- std::tie(syntheticBold, syntheticOblique) = computeNecessarySynthesis(fontForSynthesisComputation.get(), fontDescription).boldObliquePair();
+ std::tie(syntheticBold, syntheticOblique) = computeNecessarySynthesis(font.get(), fontDescription).boldObliquePair();
FontPlatformData fontPlatformData(font.get(), size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant(), fontDescription.textRenderingMode());
