<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[179368] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/179368">179368</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 14:40:17 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove support for screen font substitution
https://bugs.webkit.org/show_bug.cgi?id=141038
Reviewed by Tim Horton.
Source/WebCore:
- Removes the screen font substitution setting (which was only on in Mountain Lion)
- Remove the concept of a printer font, from the family of Font related classes.
* WebCore.exp.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::initializeFontStyle):
* page/Settings.cpp:
(WebCore::Settings::Settings):
(WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault): Deleted.
(WebCore::Settings::setScreenFontSubstitutionEnabled): Deleted.
* page/Settings.h:
(WebCore::Settings::screenFontSubstitutionEnabled): Deleted.
* page/mac/SettingsMac.mm:
(WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault): Deleted.
* platform/graphics/FontCache.h:
(WebCore::FontDescriptionFontDataCacheKey::makeFlagKey):
* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::FontCascade):
* platform/graphics/FontCascade.h:
(WebCore::FontCascade::isPrinterFont): Deleted.
* platform/graphics/FontDescription.h:
(WebCore::FontDescription::FontDescription):
(WebCore::FontDescription::setWeight):
(WebCore::FontDescription::equalForTextAutoSizing):
(WebCore::FontDescription::operator==):
(WebCore::FontDescription::usePrinterFont): Deleted.
(WebCore::FontDescription::setUsePrinterFont): Deleted.
* platform/graphics/FontPlatformData.h:
(WebCore::FontPlatformData::isCompositeFontReference):
(WebCore::FontPlatformData::hash):
(WebCore::FontPlatformData::operator==):
(WebCore::FontPlatformData::isPrinterFont): Deleted.
* platform/graphics/WidthIterator.h:
(WebCore::WidthIterator::supportsTypesettingFeatures):
* platform/graphics/cocoa/FontCascadeCocoa.mm:
(WebCore::FontCascade::drawGlyphs):
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::FontPlatformData::FontPlatformData):
(WebCore::FontPlatformData::platformDataInit):
(WebCore::FontPlatformData::platformDataAssign):
* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::FontCache::getSystemFontFallbackForCharacters):
(WebCore::FontCache::createFontPlatformData):
* platform/graphics/ios/SimpleFontDataIOS.mm:
(WebCore::Font::platformCreateScaledFont):
* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::ComplexTextController::adjustGlyphsAndAdvances):
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
(WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::FontCache::systemFallbackForCharacters):
(WebCore::FontCache::createFontPlatformData):
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::Font::compositeFontReferenceFont):
(WebCore::Font::platformCreateScaledFont):
* platform/mac/DragImageMac.mm:
(WebCore::fontFromNSFont):
(WebCore::widthWithFont):
(WebCore::drawAtPoint):
* style/StyleResolveForDocument.cpp:
(WebCore::Style::resolveForDocument):
Source/WebKit/mac:
* Misc/WebKitNSStringExtras.mm:
(-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
(-[NSString _web_widthWithFont:]):
* Misc/WebStringTruncator.mm:
(fontFromNSFont):
Update for new signature of the FontPlatformData constructor, which no longer cares about
whether to use printer fonts.
* WebView/WebPreferenceKeysPrivate.h:
Remove the WebKitScreenFontSubstitutionEnabledKey key.
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
Remove support for WebKitScreenFontSubstitutionEnabledKey.
(needsScreenFontsEnabledQuirk): Deleted.
Remove support for the Mountain Lion era 1-Password quirk.
(-[WebPreferences screenFontSubstitutionEnabled]): Deleted.
(-[WebPreferences setScreenFontSubstitutionEnabled:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
(-[WebView _preferencesChanged:]):
Remove support for the screen font substitution setting.
Source/WebKit/win:
* WebPreferenceKeysPrivate.h:
* WebPreferences.cpp:
(WebPreferences::screenFontSubstitutionEnabled):
(WebPreferences::setScreenFontSubstitutionEnabled):
Remove implementations. Have this setting set on windows didn't have any effect before,
so this doesn't change behavior.
Source/WebKit2:
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKPreferencesSetScreenFontSubstitutionEnabled):
(WKPreferencesGetScreenFontSubstitutionEnabled):
Move now empty preferences SPI to WKDeprecatedFunctions.
* Shared/WebPreferencesDefinitions.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetScreenFontSubstitutionEnabled): Deleted.
(WKPreferencesGetScreenFontSubstitutionEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* WebProcess/WebProcess.h:
(WebKit::WebProcess::presenterApplicationPid):
(WebKit::WebProcess::shouldForceScreenFontSubstitution): Deleted.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Stop piping screen font substitution setting to the web process.
Tools:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):
Remove call to now setScreenFontSubstitutionEnabled() which is a no-op.
LayoutTests:
* platform/mac/fast/text/international/hindi-spacing-expected.txt:
Update results now that buttons always use printer fonts. We were accidentally
allowing buttons to use screen fonts, which usually didn't make a difference,
but does with some fallback fonts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextinternationalhindispacingexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/international/hindi-spacing-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorepagemacSettingsMacmm">trunk/Source/WebCore/page/mac/SettingsMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptionh">trunk/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontPlatformDatah">trunk/Source/WebCore/platform/graphics/FontPlatformData.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsWidthIteratorh">trunk/Source/WebCore/platform/graphics/WidthIterator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm">trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm">trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm">trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacDragImageMacmm">trunk/Source/WebCore/platform/mac/DragImageMac.mm</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveForDocumentcpp">trunk/Source/WebCore/style/StyleResolveForDocument.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitNSStringExtrasmm">trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebStringTruncatormm">trunk/Source/WebKit/mac/Misc/WebStringTruncator.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferenceKeysPrivateh">trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/LayoutTests/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ * platform/mac/fast/text/international/hindi-spacing-expected.txt:
+ Update results now that buttons always use printer fonts. We were accidentally
+ allowing buttons to use screen fonts, which usually didn't make a difference,
+ but does with some fallback fonts.
+
</ins><span class="cx"> 2015-01-20 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Japanese line breaking rules need to be respected before and after Ruby.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextinternationalhindispacingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/international/hindi-spacing-expected.txt (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/international/hindi-spacing-expected.txt 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/LayoutTests/platform/mac/fast/text/international/hindi-spacing-expected.txt 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> text run at (0,18) width 761: "left for it. Neither the Hindi on the button below nor the same text on two lines below that should be truncated at either"
</span><span class="cx"> text run at (0,36) width 28: "end."
</span><span class="cx"> RenderBR {BR} at (27,50) size 1x0
</span><del>- RenderButton {INPUT} at (2,56) size 99x18 [bgcolor=#C0C0C0]
- RenderBlock (anonymous) at (8,2) size 83x17
- RenderText at (0,1) size 83x13
- text run at (0,1) width 83: "\x{915}\x{93F}\x{938}\x{940} \x{92D}\x{940} \x{924}\x{930}\x{939} \x{906}\x{917}\x{947} \x{92C}"
- RenderBR {BR} at (102,70) size 1x0
</del><ins>+ RenderButton {INPUT} at (2,56) size 101x18 [bgcolor=#C0C0C0]
+ RenderBlock (anonymous) at (8,2) size 85x17
+ RenderText at (0,1) size 85x13
+ text run at (0,1) width 85: "\x{915}\x{93F}\x{938}\x{940} \x{92D}\x{940} \x{924}\x{930}\x{939} \x{906}\x{917}\x{947} \x{92C}"
+ RenderBR {BR} at (104,70) size 1x0
</ins><span class="cx"> RenderInline {SPAN} at (0,0) size 114x18
</span><span class="cx"> RenderText {#text} at (0,80) size 114x18
</span><span class="cx"> text run at (0,80) width 114: "\x{915}\x{93F}\x{938}\x{940} \x{92D}\x{940} \x{924}\x{930}\x{939} \x{906}\x{917}\x{947} \x{92C}"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,72 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ - Removes the screen font substitution setting (which was only on in Mountain Lion)
+ - Remove the concept of a printer font, from the family of Font related classes.
+
+ * WebCore.exp.in:
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::initializeFontStyle):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault): Deleted.
+ (WebCore::Settings::setScreenFontSubstitutionEnabled): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::screenFontSubstitutionEnabled): Deleted.
+ * page/mac/SettingsMac.mm:
+ (WebCore::Settings::shouldEnableScreenFontSubstitutionByDefault): Deleted.
+ * platform/graphics/FontCache.h:
+ (WebCore::FontDescriptionFontDataCacheKey::makeFlagKey):
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::FontCascade):
+ * platform/graphics/FontCascade.h:
+ (WebCore::FontCascade::isPrinterFont): Deleted.
+ * platform/graphics/FontDescription.h:
+ (WebCore::FontDescription::FontDescription):
+ (WebCore::FontDescription::setWeight):
+ (WebCore::FontDescription::equalForTextAutoSizing):
+ (WebCore::FontDescription::operator==):
+ (WebCore::FontDescription::usePrinterFont): Deleted.
+ (WebCore::FontDescription::setUsePrinterFont): Deleted.
+ * platform/graphics/FontPlatformData.h:
+ (WebCore::FontPlatformData::isCompositeFontReference):
+ (WebCore::FontPlatformData::hash):
+ (WebCore::FontPlatformData::operator==):
+ (WebCore::FontPlatformData::isPrinterFont): Deleted.
+ * platform/graphics/WidthIterator.h:
+ (WebCore::WidthIterator::supportsTypesettingFeatures):
+ * platform/graphics/cocoa/FontCascadeCocoa.mm:
+ (WebCore::FontCascade::drawGlyphs):
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::FontPlatformData::FontPlatformData):
+ (WebCore::FontPlatformData::platformDataInit):
+ (WebCore::FontPlatformData::platformDataAssign):
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::FontCache::getSystemFontFallbackForCharacters):
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/graphics/ios/SimpleFontDataIOS.mm:
+ (WebCore::Font::platformCreateScaledFont):
+ * platform/graphics/mac/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+ * platform/graphics/mac/ComplexTextControllerCoreText.mm:
+ (WebCore::ComplexTextController::collectComplexTextRunsForCharacters):
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::FontCache::systemFallbackForCharacters):
+ (WebCore::FontCache::createFontPlatformData):
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::Font::compositeFontReferenceFont):
+ (WebCore::Font::platformCreateScaledFont):
+ * platform/mac/DragImageMac.mm:
+ (WebCore::fontFromNSFont):
+ (WebCore::widthWithFont):
+ (WebCore::drawAtPoint):
+ * style/StyleResolveForDocument.cpp:
+ (WebCore::Style::resolveForDocument):
+
</ins><span class="cx"> 2015-01-20 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Japanese line breaking rules need to be respected before and after Ruby.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> __ZN7WebCore11FontCascade18shouldUseSmoothingEv
</span><span class="cx"> __ZN7WebCore11FontCascade21setShouldUseSmoothingEb
</span><span class="cx"> __ZN7WebCore11FontCascade29setDefaultTypesettingFeaturesEj
</span><del>-__ZN7WebCore11FontCascadeC1ERKNS_16FontPlatformDataEbNS_17FontSmoothingModeE
</del><ins>+__ZN7WebCore11FontCascadeC1ERKNS_16FontPlatformDataENS_17FontSmoothingModeE
</ins><span class="cx"> __ZN7WebCore11FontCascadeC1Ev
</span><span class="cx"> __ZN7WebCore11FontCascadeaSERKS0_
</span><span class="cx"> __ZN7WebCore11FrameLoader11loadArchiveEN3WTF10PassRefPtrINS_7ArchiveEEE
</span><span class="lines">@@ -1470,7 +1470,6 @@
</span><span class="cx"> __ZN7WebCore8Settings32defaultDOMTimerAlignmentIntervalEv
</span><span class="cx"> __ZN7WebCore8Settings32setAcceleratedCompositingEnabledEb
</span><span class="cx"> __ZN7WebCore8Settings32setNeedsAdobeFrameReloadingQuirkEb
</span><del>-__ZN7WebCore8Settings32setScreenFontSubstitutionEnabledEb
</del><span class="cx"> __ZN7WebCore8Settings33setFontFallbackPrefersPictographsEb
</span><span class="cx"> __ZN7WebCore8Settings35setBackgroundShouldExtendBeyondPageEb
</span><span class="cx"> __ZN7WebCore8Settings37setScrollingPerformanceLoggingEnabledEb
</span><span class="lines">@@ -2372,8 +2371,7 @@
</span><span class="cx"> __ZN7WebCore13toDeviceSpaceERKNS_9FloatRectEP8NSWindow
</span><span class="cx"> __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span><span class="cx"> __ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_
</span><del>-__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
-__ZN7WebCore16FontPlatformDataC2EP6NSFontfbbbNS_15FontOrientationENS_16FontWidthVariantE
</del><ins>+__ZN7WebCore16FontPlatformDataC1EP6NSFontfbbNS_15FontOrientationENS_16FontWidthVariantE
</ins><span class="cx"> __ZN7WebCore16colorFromNSColorEP7NSColor
</span><span class="cx"> __ZN7WebCore16deleteAllCookiesERKNS_21NetworkStorageSessionE
</span><span class="cx"> __ZN7WebCore16enclosingIntRectERK7_NSRect
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -2077,7 +2077,6 @@
</span><span class="cx"> {
</span><span class="cx"> FontDescription fontDescription;
</span><span class="cx"> fontDescription.setRenderingMode(settings->fontRenderingMode());
</span><del>- fontDescription.setUsePrinterFont(document().printing() || !settings->screenFontSubstitutionEnabled());
</del><span class="cx"> fontDescription.setOneFamily(standardFamily);
</span><span class="cx"> fontDescription.setKeywordSizeFromIdentifier(CSSValueMedium);
</span><span class="cx"> setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueMedium, false, document()));
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -177,7 +177,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx"> SETTINGS_INITIALIZER_LIST
</span><del>- , m_screenFontSubstitutionEnabled(shouldEnableScreenFontSubstitutionByDefault())
</del><span class="cx"> , m_isJavaEnabled(false)
</span><span class="cx"> , m_isJavaEnabledForLocalFiles(true)
</span><span class="cx"> , m_loadsImagesAutomatically(false)
</span><span class="lines">@@ -231,13 +230,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><del>-bool Settings::shouldEnableScreenFontSubstitutionByDefault()
-{
- return true;
-}
-#endif
-
-#if !PLATFORM(COCOA)
</del><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><span class="cx"> // Other platforms can set up fonts from a client, but on Mac, we want it in WebCore to share code between WebKit1 and WebKit2.
</span><span class="lines">@@ -523,16 +515,6 @@
</span><span class="cx"> PageCache::shared().pruneToSizeNow(0, PruningReason::None);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Settings::setScreenFontSubstitutionEnabled(bool enabled)
-{
- if (m_screenFontSubstitutionEnabled == enabled)
- return;
- m_screenFontSubstitutionEnabled = enabled;
-
- if (m_page)
- m_page->setNeedsRecalcStyleInAllFrames();
-}
-
</del><span class="cx"> void Settings::setFontRenderingMode(FontRenderingMode mode)
</span><span class="cx"> {
</span><span class="cx"> if (fontRenderingMode() == mode)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/page/Settings.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -125,9 +125,6 @@
</span><span class="cx">
</span><span class="cx"> SETTINGS_GETTERS_AND_SETTERS
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void setScreenFontSubstitutionEnabled(bool);
- bool screenFontSubstitutionEnabled() const { return m_screenFontSubstitutionEnabled; }
-
</del><span class="cx"> WEBCORE_EXPORT void setJavaEnabled(bool);
</span><span class="cx"> bool isJavaEnabled() const { return m_isJavaEnabled; }
</span><span class="cx">
</span><span class="lines">@@ -283,7 +280,6 @@
</span><span class="cx"> explicit Settings(Page*);
</span><span class="cx">
</span><span class="cx"> void initializeDefaultFontFamilies();
</span><del>- static bool shouldEnableScreenFontSubstitutionByDefault();
</del><span class="cx">
</span><span class="cx"> Page* m_page;
</span><span class="cx">
</span><span class="lines">@@ -300,7 +296,6 @@
</span><span class="cx">
</span><span class="cx"> SETTINGS_MEMBER_VARIABLES
</span><span class="cx">
</span><del>- bool m_screenFontSubstitutionEnabled : 1;
</del><span class="cx"> bool m_isJavaEnabled : 1;
</span><span class="cx"> bool m_isJavaEnabledForLocalFiles : 1;
</span><span class="cx"> bool m_loadsImagesAutomatically : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacSettingsMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/SettingsMac.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/page/mac/SettingsMac.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -28,15 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool Settings::shouldEnableScreenFontSubstitutionByDefault()
-{
-#if PLATFORM(MAC)
- return false;
-#else
- return true;
-#endif
-}
-
</del><span class="cx"> void Settings::initializeDefaultFontFamilies()
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -79,11 +79,10 @@
</span><span class="cx"> { }
</span><span class="cx"> static unsigned makeFlagKey(const FontDescription& description)
</span><span class="cx"> {
</span><del>- return static_cast<unsigned>(description.widthVariant()) << 5
- | static_cast<unsigned>(description.nonCJKGlyphOrientation()) << 4
- | static_cast<unsigned>(description.orientation()) << 3
- | static_cast<unsigned>(description.italic()) << 2
- | static_cast<unsigned>(description.usePrinterFont()) << 1
</del><ins>+ return static_cast<unsigned>(description.widthVariant()) << 4
+ | static_cast<unsigned>(description.nonCJKGlyphOrientation()) << 3
+ | static_cast<unsigned>(description.orientation()) << 2
+ | static_cast<unsigned>(description.italic()) << 1
</ins><span class="cx"> | static_cast<unsigned>(description.renderingMode());
</span><span class="cx"> }
</span><span class="cx"> bool operator==(const FontDescriptionFontDataCacheKey& other) const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -124,14 +124,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: We should make this constructor platform-independent.
</span><del>-FontCascade::FontCascade(const FontPlatformData& font, bool isPrinterFont, FontSmoothingMode fontSmoothingMode)
</del><ins>+FontCascade::FontCascade(const FontPlatformData& font, FontSmoothingMode fontSmoothingMode)
</ins><span class="cx"> : m_glyphs(FontGlyphs::createForPlatformFont(font))
</span><span class="cx"> , m_letterSpacing(0)
</span><span class="cx"> , m_wordSpacing(0)
</span><span class="cx"> , m_useBackslashAsYenSymbol(false)
</span><span class="cx"> , m_typesettingFeatures(computeTypesettingFeatures())
</span><span class="cx"> {
</span><del>- m_fontDescription.setUsePrinterFont(isPrinterFont);
</del><span class="cx"> m_fontDescription.setFontSmoothing(fontSmoothingMode);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_fontDescription.setSpecifiedSize(CTFontGetSize(font.font()));
</span><span class="lines">@@ -154,7 +153,6 @@
</span><span class="cx"> m_fontDescription.setComputedSize(CTFontGetSize(primaryFont));
</span><span class="cx"> m_fontDescription.setIsItalic(CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitItalic);
</span><span class="cx"> m_fontDescription.setWeight((CTFontGetSymbolicTraits(primaryFont) & kCTFontTraitBold) ? FontWeightBold : FontWeightNormal);
</span><del>- m_fontDescription.setUsePrinterFont(font.isPrinterFont());
</del><span class="cx"> m_glyphs = retrieveOrAddCachedFontGlyphs(m_fontDescription, fontSelector.get());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> WEBCORE_EXPORT FontCascade();
</span><span class="cx"> WEBCORE_EXPORT FontCascade(const FontDescription&, float letterSpacing, float wordSpacing);
</span><span class="cx"> // This constructor is only used if the platform wants to start with a native font.
</span><del>- WEBCORE_EXPORT FontCascade(const FontPlatformData&, bool isPrinting, FontSmoothingMode = AutoSmoothing);
</del><ins>+ WEBCORE_EXPORT FontCascade(const FontPlatformData&, FontSmoothingMode = AutoSmoothing);
</ins><span class="cx">
</span><span class="cx"> // FIXME: We should make this constructor platform-independent.
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -156,7 +156,6 @@
</span><span class="cx"> void setWordSpacing(float s) { m_wordSpacing = s; }
</span><span class="cx"> void setLetterSpacing(float s) { m_letterSpacing = s; }
</span><span class="cx"> bool isFixedPitch() const;
</span><del>- bool isPrinterFont() const { return m_fontDescription.usePrinterFont(); }
</del><span class="cx">
</span><span class="cx"> FontRenderingMode renderingMode() const { return m_fontDescription.renderingMode(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx"> , m_smallCaps(FontSmallCapsOff)
</span><span class="cx"> , m_isAbsoluteSize(false)
</span><span class="cx"> , m_weight(FontWeightNormal)
</span><del>- , m_usePrinterFont(false)
</del><span class="cx"> , m_renderingMode(NormalRenderingMode)
</span><span class="cx"> , m_kerning(AutoKerning)
</span><span class="cx"> , m_commonLigaturesState(NormalLigaturesState)
</span><span class="lines">@@ -116,7 +115,6 @@
</span><span class="cx"> FontWeight weight() const { return static_cast<FontWeight>(m_weight); }
</span><span class="cx"> FontWeight lighterWeight() const;
</span><span class="cx"> FontWeight bolderWeight() const;
</span><del>- bool usePrinterFont() const { return m_usePrinterFont; }
</del><span class="cx"> // only use fixed default size when there is only one font family, and that family is "monospace"
</span><span class="cx"> bool useFixedDefaultSize() const { return familyCount() == 1 && firstFamily() == monospaceFamily; }
</span><span class="cx"> FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); }
</span><span class="lines">@@ -153,7 +151,6 @@
</span><span class="cx"> void setIsSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCapsOff); }
</span><span class="cx"> void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
</span><span class="cx"> void setWeight(FontWeight w) { m_weight = w; }
</span><del>- void setUsePrinterFont(bool p) { m_usePrinterFont = p; }
</del><span class="cx"> void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
</span><span class="cx"> void setKerning(Kerning kerning) { m_kerning = kerning; }
</span><span class="cx"> void setCommonLigaturesState(LigaturesState commonLigaturesState) { m_commonLigaturesState = commonLigaturesState; }
</span><span class="lines">@@ -190,7 +187,6 @@
</span><span class="cx"> && m_specifiedSize == other.m_specifiedSize
</span><span class="cx"> && m_smallCaps == other.m_smallCaps
</span><span class="cx"> && m_isAbsoluteSize == other.m_isAbsoluteSize
</span><del>- && m_usePrinterFont == other.m_usePrinterFont;
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -219,7 +215,6 @@
</span><span class="cx"> unsigned m_isAbsoluteSize : 1; // Whether or not CSS specified an explicit size
</span><span class="cx"> // (logical sizes like "medium" don't count).
</span><span class="cx"> unsigned m_weight : 8; // FontWeight
</span><del>- unsigned m_usePrinterFont : 1;
</del><span class="cx">
</span><span class="cx"> unsigned m_renderingMode : 1; // Used to switch between CG and GDI text on Windows.
</span><span class="cx"> unsigned m_kerning : 2; // Kerning
</span><span class="lines">@@ -247,7 +242,6 @@
</span><span class="cx"> && m_smallCaps == other.m_smallCaps
</span><span class="cx"> && m_isAbsoluteSize == other.m_isAbsoluteSize
</span><span class="cx"> && m_weight == other.m_weight
</span><del>- && m_usePrinterFont == other.m_usePrinterFont
</del><span class="cx"> && m_renderingMode == other.m_renderingMode
</span><span class="cx"> && m_kerning == other.m_kerning
</span><span class="cx"> && m_commonLigaturesState == other.m_commonLigaturesState
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontPlatformData.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/FontPlatformData.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -85,10 +85,10 @@
</span><span class="cx"> FontPlatformData(float size, bool syntheticBold, bool syntheticOblique, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- WEBCORE_EXPORT FontPlatformData(CTFontRef, float size, bool isPrinterFont = false, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
</del><ins>+ WEBCORE_EXPORT FontPlatformData(CTFontRef, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> // FIXME: Remove this when all NSFont usage is removed.
</span><del>- WEBCORE_EXPORT FontPlatformData(NSFont *, float size, bool isPrinterFont = false, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
</del><ins>+ WEBCORE_EXPORT FontPlatformData(NSFont *, float size, bool syntheticBold = false, bool syntheticOblique = false, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -144,9 +144,6 @@
</span><span class="cx"> bool syntheticOblique() const { return m_syntheticOblique; }
</span><span class="cx"> bool isColorBitmapFont() const { return m_isColorBitmapFont; }
</span><span class="cx"> bool isCompositeFontReference() const { return m_isCompositeFontReference; }
</span><del>-#if PLATFORM(COCOA)
- bool isPrinterFont() const { return m_isPrinterFont; }
-#endif
</del><span class="cx"> FontOrientation orientation() const { return m_orientation; }
</span><span class="cx"> FontWidthVariant widthVariant() const { return m_widthVariant; }
</span><span class="cx">
</span><span class="lines">@@ -163,10 +160,10 @@
</span><span class="cx"> #elif OS(DARWIN)
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> ASSERT(m_font || !m_cgFont);
</span><del>- uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_isPrinterFont << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
</del><ins>+ uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
</ins><span class="cx"> #else
</span><span class="cx"> ASSERT(m_font || !m_cgFont || m_isEmoji);
</span><del>- uintptr_t hashCodes[3] = { static_cast<uintptr_t>(CFHash(m_font)), m_widthVariant, static_cast<uintptr_t>(m_isEmoji << 4 | m_isPrinterFont << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
</del><ins>+ uintptr_t hashCodes[3] = { static_cast<uintptr_t>(CFHash(m_font)), m_widthVariant, static_cast<uintptr_t>(m_isEmoji << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticOblique) };
</ins><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx"> return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
</span><span class="cx"> #elif USE(CAIRO)
</span><span class="lines">@@ -184,9 +181,6 @@
</span><span class="cx"> && m_syntheticOblique == other.m_syntheticOblique
</span><span class="cx"> && m_isColorBitmapFont == other.m_isColorBitmapFont
</span><span class="cx"> && m_isCompositeFontReference == other.m_isCompositeFontReference
</span><del>-#if PLATFORM(COCOA)
- && m_isPrinterFont == other.m_isPrinterFont
-#endif
</del><span class="cx"> && m_orientation == other.m_orientation
</span><span class="cx"> && m_widthVariant == other.m_widthVariant;
</span><span class="cx"> }
</span><span class="lines">@@ -251,9 +245,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_isColorBitmapFont { false };
</span><span class="cx"> bool m_isCompositeFontReference { false };
</span><del>-#if PLATFORM(COCOA)
- bool m_isPrinterFont { false };
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> bool m_useGDI { false };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsWidthIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/WidthIterator.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/WidthIterator.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -61,9 +61,6 @@
</span><span class="cx"> static bool supportsTypesettingFeatures(const FontCascade& font)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- if (!font.isPrinterFont())
- return !font.typesettingFeatures();
-
</del><span class="cx"> return !(font.typesettingFeatures() & ~(Kerning | Ligatures));
</span><span class="cx"> #else
</span><span class="cx"> return !font.typesettingFeatures();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCascadeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -248,21 +248,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- NSFont* drawFont;
- if (!isPrinterFont()) {
- drawFont = [platformData.nsFont() screenFont];
- if (drawFont != platformData.nsFont()) {
- // We are getting this in too many places (3406411); use ERROR so it only prints on debug versions for now. (We should debug this also, eventually).
- LOG_ERROR("Attempting to set non-screen font (%@) when drawing to screen. Using screen font anyway, may result in incorrect metrics.",
- [[[platformData.nsFont() fontDescriptor] fontAttributes] objectForKey:NSFontNameAttribute]);
- }
- } else {
- drawFont = [platformData.nsFont() printerFont];
- if (drawFont != platformData.nsFont()) {
- NSLog(@"Attempting to set non-printer font (%@) when printing. Using printer font anyway, may result in incorrect metrics.",
- [[[platformData.nsFont() fontDescriptor] fontAttributes] objectForKey:NSFontNameAttribute]);
- }
- }
</del><ins>+ NSFont* drawFont = [platformData.nsFont() printerFont];
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CGContextSetFont(cgContext, platformData.cgFont());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> // These CoreText Text Spacing feature selectors are not defined in CoreText.
</span><span class="cx"> enum TextSpacingCTFeatureSelector { TextSpacingProportional, TextSpacingFullWidth, TextSpacingHalfWidth, TextSpacingThirdWidth, TextSpacingQuarterWidth };
</span><span class="cx">
</span><del>-FontPlatformData::FontPlatformData(CTFontRef font, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
</del><ins>+FontPlatformData::FontPlatformData(CTFontRef font, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
</ins><span class="cx"> : m_syntheticBold(syntheticBold)
</span><span class="cx"> , m_syntheticOblique(syntheticOblique)
</span><span class="cx"> , m_orientation(orientation)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx"> , m_cgFont(adoptCF(CTFontCopyGraphicsFont(font, NULL)))
</span><span class="cx"> , m_isColorBitmapFont(CTFontGetSymbolicTraits(font) & kCTFontTraitColorGlyphs)
</span><span class="cx"> , m_isCompositeFontReference(CTFontGetSymbolicTraits(font) & kCTFontCompositeTrait)
</span><del>- , m_isPrinterFont(isPrinterFont)
</del><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(font, font);
</span><span class="cx"> CFRetain(m_font);
</span><span class="lines">@@ -59,8 +58,8 @@
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> // FIXME: Remove this when all NSFont usage is removed.
</span><del>-FontPlatformData::FontPlatformData(NSFont *font, float size, bool isPrinterFont, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
- : FontPlatformData((CTFontRef)font, size, isPrinterFont, syntheticBold, syntheticOblique, orientation, widthVariant)
</del><ins>+FontPlatformData::FontPlatformData(NSFont *font, float size, bool syntheticBold, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthVariant)
+ : FontPlatformData((CTFontRef)font, size, syntheticBold, syntheticOblique, orientation, widthVariant)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -80,7 +79,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_cgFont = f.m_cgFont;
</span><span class="cx"> m_ctFont = f.m_ctFont;
</span><del>- m_isPrinterFont = f.m_isPrinterFont;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& f)
</span><span class="lines">@@ -97,7 +95,6 @@
</span><span class="cx"> CFRelease(m_font);
</span><span class="cx"> m_font = f.m_font;
</span><span class="cx"> m_ctFont = f.m_ctFont;
</span><del>- m_isPrinterFont = f.m_isPrinterFont;
</del><span class="cx">
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> bool syntheticBold = (originalTraits & kCTFontTraitBold) && !(actualTraits & kCTFontTraitBold);
</span><span class="cx"> bool syntheticOblique = (originalTraits & kCTFontTraitItalic) && !(actualTraits & kCTFontTraitItalic);
</span><span class="cx">
</span><del>- FontPlatformData alternateFont(substituteFont.get(), platformData.size(), platformData.isPrinterFont(), syntheticBold, syntheticOblique, platformData.m_orientation);
</del><ins>+ FontPlatformData alternateFont(substituteFont.get(), platformData.size(), syntheticBold, syntheticOblique, platformData.m_orientation);
</ins><span class="cx"> alternateFont.m_isEmoji = CTFontIsAppleColorEmoji(substituteFont.get());
</span><span class="cx">
</span><span class="cx"> return fontForPlatformData(alternateFont);
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> bool syntheticBold = (traits & kCTFontTraitBold) && !(actualTraits & kCTFontTraitBold) && !isAppleColorEmoji;
</span><span class="cx"> bool syntheticOblique = (traits & kCTFontTraitItalic) && !(actualTraits & kCTFontTraitItalic) && !isAppleColorEmoji;
</span><span class="cx">
</span><del>- auto result = std::make_unique<FontPlatformData>(ctFont.get(), size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</del><ins>+ auto result = std::make_unique<FontPlatformData>(ctFont.get(), size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</ins><span class="cx"> if (isAppleColorEmoji)
</span><span class="cx"> result->m_isEmoji = true;
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosSimpleFontDataIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/ios/SimpleFontDataIOS.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> CTFontSymbolicTraits fontTraits = CTFontGetSymbolicTraits(m_platformData.font());
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontCopyFontDescriptor(m_platformData.font()));
</span><span class="cx"> RetainPtr<CTFontRef> scaledFont = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), size, nullptr));
</span><del>- FontPlatformData scaledFontData(scaledFont.get(), size, m_platformData.isPrinterFont(), false, false, m_platformData.orientation());
</del><ins>+ FontPlatformData scaledFontData(scaledFont.get(), size, false, false, m_platformData.orientation());
</ins><span class="cx">
</span><span class="cx"> if (scaledFontData.font()) {
</span><span class="cx"> if (m_platformData.m_syntheticBold)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -588,7 +588,6 @@
</span><span class="cx"> const CGSize* advances = complexTextRun.advances();
</span><span class="cx">
</span><span class="cx"> bool lastRun = r + 1 == runCount;
</span><del>- bool roundsAdvances = !m_font.isPrinterFont() && font.platformData().roundsGlyphAdvances();
</del><span class="cx"> float spaceWidth = font.spaceWidth() - font.syntheticBoldOffset();
</span><span class="cx"> CGFloat roundedSpaceWidth = roundCGFloat(spaceWidth);
</span><span class="cx"> const UChar* cp = complexTextRun.characters();
</span><span class="lines">@@ -631,9 +630,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float roundedAdvanceWidth = roundf(advance.width);
</span><del>- if (roundsAdvances)
- advance.width = roundedAdvanceWidth;
-
</del><span class="cx"> advance.width += font.syntheticBoldOffset();
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacComplexTextControllerCoreTextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextControllerCoreText.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> // Core Text may have used a font that is not known to NSFontManager. In that case, fall back on
</span><span class="cx"> // using the font as returned, even though it may not have the best NSFontRenderingMode.
</span><span class="cx"> if (!runFont) {
</span><del>- FontPlatformData runFontPlatformData((NSFont *)runCTFont, CTFontGetSize(runCTFont), m_font.fontDescription().usePrinterFont());
</del><ins>+ FontPlatformData runFontPlatformData((NSFont *)runCTFont, CTFontGetSize(runCTFont));
</ins><span class="cx"> runFont = &fontCache().fontForPlatformData(runFontPlatformData).get();
</span><span class="cx"> }
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -389,12 +389,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- substituteFont = description.usePrinterFont() ? [substituteFont printerFont] : [substituteFont screenFont];
</del><ins>+ substituteFont = [substituteFont printerFont];
</ins><span class="cx">
</span><span class="cx"> substituteFontTraits = [fontManager traitsOfFont:substituteFont];
</span><span class="cx"> substituteFontWeight = [fontManager weightOfFont:substituteFont];
</span><span class="cx">
</span><del>- FontPlatformData alternateFont(substituteFont, platformData.size(), platformData.isPrinterFont(),
</del><ins>+ FontPlatformData alternateFont(substituteFont, platformData.size(),
</ins><span class="cx"> !isPlatformFont && isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(substituteFontWeight),
</span><span class="cx"> !isPlatformFont && (traits & NSFontItalicTrait) && !(substituteFontTraits & NSFontItalicTrait),
</span><span class="cx"> platformData.m_orientation);
</span><span class="lines">@@ -499,11 +499,11 @@
</span><span class="cx"> actualTraits = [fontManager traitsOfFont:nsFont];
</span><span class="cx"> NSInteger actualWeight = [fontManager weightOfFont:nsFont];
</span><span class="cx">
</span><del>- NSFont *platformFont = fontDescription.usePrinterFont() ? [nsFont printerFont] : [nsFont screenFont];
</del><ins>+ NSFont *platformFont = [nsFont printerFont];
</ins><span class="cx"> bool syntheticBold = isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(actualWeight);
</span><span class="cx"> bool syntheticOblique = (traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait);
</span><span class="cx">
</span><del>- return std::make_unique<FontPlatformData>(platformFont, size, fontDescription.usePrinterFont(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</del><ins>+ return std::make_unique<FontPlatformData>(platformFont, size, syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacSimpleFontDataMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -95,14 +95,13 @@
</span><span class="cx">
</span><span class="cx"> auto addResult = m_derivedFontData->compositeFontReferences.add(key, nullptr);
</span><span class="cx"> if (addResult.isNewEntry) {
</span><del>- bool isUsingPrinterFont = platformData().isPrinterFont();
- NSFont *substituteFont = isUsingPrinterFont ? [key printerFont] : [key screenFont];
</del><ins>+ NSFont *substituteFont = [key printerFont];
</ins><span class="cx">
</span><span class="cx"> CTFontSymbolicTraits traits = CTFontGetSymbolicTraits((CTFontRef)substituteFont);
</span><span class="cx"> bool syntheticBold = platformData().syntheticBold() && !(traits & kCTFontBoldTrait);
</span><span class="cx"> bool syntheticOblique = platformData().syntheticOblique() && !(traits & kCTFontItalicTrait);
</span><span class="cx">
</span><del>- FontPlatformData substitutePlatform(substituteFont, platformData().size(), isUsingPrinterFont, syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
</del><ins>+ FontPlatformData substitutePlatform(substituteFont, platformData().size(), syntheticBold, syntheticOblique, platformData().orientation(), platformData().widthVariant());
</ins><span class="cx"> addResult.iterator->value = Font::create(substitutePlatform, isCustomFont());
</span><span class="cx"> }
</span><span class="cx"> return addResult.iterator->value.get();
</span><span class="lines">@@ -274,7 +273,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>-PassRefPtr<Font> Font::platformCreateScaledFont(const FontDescription& fontDescription, float scaleFactor) const
</del><ins>+PassRefPtr<Font> Font::platformCreateScaledFont(const FontDescription&, float scaleFactor) const
</ins><span class="cx"> {
</span><span class="cx"> if (isCustomFont()) {
</span><span class="cx"> FontPlatformData scaledFontData(m_platformData);
</span><span class="lines">@@ -284,11 +283,11 @@
</span><span class="cx">
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> float size = m_platformData.size() * scaleFactor;
</span><del>- FontPlatformData scaledFontData([[NSFontManager sharedFontManager] convertFont:m_platformData.nsFont() toSize:size], size, m_platformData.isPrinterFont(), false, false, m_platformData.orientation());
</del><ins>+ FontPlatformData scaledFontData([[NSFontManager sharedFontManager] convertFont:m_platformData.nsFont() toSize:size], size, false, false, m_platformData.orientation());
</ins><span class="cx">
</span><span class="cx"> // AppKit resets the type information (screen/printer) when you convert a font to a different size.
</span><span class="cx"> // We have to fix up the font that we're handed back.
</span><del>- scaledFontData.setNSFont(fontDescription.usePrinterFont() ? [scaledFontData.nsFont() printerFont] : [scaledFontData.nsFont() screenFont]);
</del><ins>+ scaledFontData.setNSFont([scaledFontData.nsFont() printerFont]);
</ins><span class="cx">
</span><span class="cx"> if (scaledFontData.font()) {
</span><span class="cx"> NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacDragImageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/DragImageMac.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/platform/mac/DragImageMac.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -168,8 +168,7 @@
</span><span class="cx"> CFRelease(currentFont);
</span><span class="cx"> currentFont = font;
</span><span class="cx"> CFRetain(currentFont);
</span><del>- FontPlatformData f(font, [font pointSize]);
- currentRenderer = FontCascade(f, ![[NSGraphicsContext currentContext] isDrawingToScreen]);
</del><ins>+ currentRenderer = FontCascade(FontPlatformData(font, [font pointSize]));
</ins><span class="cx"> return currentRenderer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -192,7 +191,7 @@
</span><span class="cx"> [string getCharacters:buffer.data()];
</span><span class="cx">
</span><span class="cx"> if (canUseFastRenderer(buffer.data(), length)) {
</span><del>- FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
</del><ins>+ FontCascade webCoreFont(FontPlatformData(font, [font pointSize]));
</ins><span class="cx"> TextRun run(buffer.data(), length);
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx"> return webCoreFont.width(run);
</span><span class="lines">@@ -224,7 +223,7 @@
</span><span class="cx"> if (!flipped)
</span><span class="cx"> CGContextScaleCTM(cgContext, 1, -1);
</span><span class="cx">
</span><del>- FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), ![nsContext isDrawingToScreen], Antialiased);
</del><ins>+ FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), Antialiased);
</ins><span class="cx"> TextRun run(buffer.data(), length);
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveForDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveForDocument.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebCore/style/StyleResolveForDocument.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -98,7 +98,6 @@
</span><span class="cx">
</span><span class="cx"> FontDescription fontDescription;
</span><span class="cx"> fontDescription.setScript(localeToScriptCodeForFontSelection(documentStyle.get().locale()));
</span><del>- fontDescription.setUsePrinterFont(document.printing() || !settings.screenFontSubstitutionEnabled());
</del><span class="cx"> fontDescription.setRenderingMode(settings.fontRenderingMode());
</span><span class="cx"> fontDescription.setOneFamily(standardFamily);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ * Misc/WebKitNSStringExtras.mm:
+ (-[NSString _web_drawAtPoint:font:textColor:allowingFontSmoothing:]):
+ (-[NSString _web_widthWithFont:]):
+ * Misc/WebStringTruncator.mm:
+ (fontFromNSFont):
+ Update for new signature of the FontPlatformData constructor, which no longer cares about
+ whether to use printer fonts.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ Remove the WebKitScreenFontSubstitutionEnabledKey key.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ Remove support for WebKitScreenFontSubstitutionEnabledKey.
+
+ (needsScreenFontsEnabledQuirk): Deleted.
+ Remove support for the Mountain Lion era 1-Password quirk.
+
+ (-[WebPreferences screenFontSubstitutionEnabled]): Deleted.
+ (-[WebPreferences setScreenFontSubstitutionEnabled:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ (-[WebView _preferencesChanged:]):
+ Remove support for the screen font substitution setting.
+
</ins><span class="cx"> 2015-01-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up / modernize PageCache class
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitNSStringExtrasmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/Misc/WebKitNSStringExtras.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if (!flipped)
</span><span class="cx"> CGContextScaleCTM(cgContext, 1, -1);
</span><span class="cx">
</span><del>- FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), ![nsContext isDrawingToScreen], fontSmoothingIsAllowed ? AutoSmoothing : Antialiased);
</del><ins>+ FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), fontSmoothingIsAllowed ? AutoSmoothing : Antialiased);
</ins><span class="cx"> TextRun run(buffer.data(), length);
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx">
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> [self getCharacters:buffer.data()];
</span><span class="cx">
</span><span class="cx"> if (canUseFastRenderer(buffer.data(), length)) {
</span><del>- FontCascade webCoreFont(FontPlatformData(font, [font pointSize]), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
</del><ins>+ FontCascade webCoreFont(FontPlatformData(font, [font pointSize]));
</ins><span class="cx"> TextRun run(buffer.data(), length);
</span><span class="cx"> run.disableRoundingHacks();
</span><span class="cx"> return webCoreFont.width(run);
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebStringTruncatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebStringTruncator.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebStringTruncator.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/Misc/WebStringTruncator.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> if ([font isEqual:currentNSFont.get().get()])
</span><span class="cx"> return currentFont;
</span><span class="cx"> currentNSFont.get() = font;
</span><del>- currentFont.get() = WebCore::FontCascade(WebCore::FontPlatformData(font, [font pointSize]), ![[NSGraphicsContext currentContext] isDrawingToScreen]);
</del><ins>+ currentFont.get() = WebCore::FontCascade(WebCore::FontPlatformData(font, [font pointSize]));
</ins><span class="cx"> return currentFont;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> #define WebKitShouldRespectImageOrientationKey @"WebKitShouldRespectImageOrientation"
</span><span class="cx"> #define WebKitRequestAnimationFrameEnabledPreferenceKey @"WebKitRequestAnimationFrameEnabled"
</span><span class="cx"> #define WebKitDiagnosticLoggingEnabledKey @"WebKitDiagnosticLoggingEnabled"
</span><del>-#define WebKitScreenFontSubstitutionEnabledKey @"WebKitScreenFontSubstitutionEnabled"
</del><span class="cx"> #define WebKitStorageBlockingPolicyKey @"WebKitStorageBlockingPolicy"
</span><span class="cx"> #define WebKitPlugInSnapshottingEnabledPreferenceKey @"WebKitPlugInSnapshottingEnabled"
</span><span class="cx"> #define WebKitQTKitEnabledPreferenceKey @"WebKitQTKitEnabled"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -543,12 +543,6 @@
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitRequestAnimationFrameEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitWantsBalancedSetDefersLoadingBehaviorKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitDiagnosticLoggingEnabledKey,
</span><del>-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- [NSNumber numberWithBool:NO],
-#else
- [NSNumber numberWithBool:YES],
-#endif
- WebKitScreenFontSubstitutionEnabledKey,
</del><span class="cx"> [NSNumber numberWithInt:WebAllowAllStorage], WebKitStorageBlockingPolicyKey,
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitPlugInSnapshottingEnabledPreferenceKey,
</span><span class="cx">
</span><span class="lines">@@ -2356,29 +2350,6 @@
</span><span class="cx"> [self _setBoolValue:enabled forKey:WebKitDiagnosticLoggingEnabledKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool needsScreenFontsEnabledQuirk()
-{
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- static bool is1PasswordNeedingScreenFontsQuirk = WKExecutableWasLinkedOnOrBeforeMountainLion()
- && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"ws.agile.1Password"];
- return is1PasswordNeedingScreenFontsQuirk;
-#else
- return NO;
-#endif
-}
-
-- (BOOL)screenFontSubstitutionEnabled
-{
- if (needsScreenFontsEnabledQuirk())
- return YES;
- return [self _boolValueForKey:WebKitScreenFontSubstitutionEnabledKey];
-}
-
-- (void)setScreenFontSubstitutionEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitScreenFontSubstitutionEnabledKey];
-}
-
</del><span class="cx"> - (void)setStorageBlockingPolicy:(WebStorageBlockingPolicy)storageBlockingPolicy
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -394,9 +394,6 @@
</span><span class="cx"> - (BOOL)diagnosticLoggingEnabled;
</span><span class="cx"> - (void)setDiagnosticLoggingEnabled:(BOOL)enabled;
</span><span class="cx">
</span><del>-- (BOOL)screenFontSubstitutionEnabled;
-- (void)setScreenFontSubstitutionEnabled:(BOOL)enabled;
-
</del><span class="cx"> - (void)setStorageBlockingPolicy:(WebStorageBlockingPolicy)storageBlockingPolicy;
</span><span class="cx"> - (WebStorageBlockingPolicy)storageBlockingPolicy;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1208,7 +1208,6 @@
</span><span class="cx"> _private->page->settings().setDefaultFixedFontSize(13);
</span><span class="cx"> _private->page->settings().setDownloadableBinaryFontsEnabled(false);
</span><span class="cx"> _private->page->settings().setAcceleratedDrawingEnabled([preferences acceleratedDrawingEnabled]);
</span><del>- _private->page->settings().setScreenFontSubstitutionEnabled(false);
</del><span class="cx">
</span><span class="cx"> _private->page->settings().setFontFallbackPrefersPictographs(true);
</span><span class="cx"> _private->page->settings().setPictographFontFamily("AppleColorEmoji");
</span><span class="lines">@@ -2204,12 +2203,6 @@
</span><span class="cx"> settings.setUsesEncodingDetector([preferences usesEncodingDetector]);
</span><span class="cx"> settings.setFantasyFontFamily([preferences fantasyFontFamily]);
</span><span class="cx"> settings.setFixedFontFamily([preferences fixedFontFamily]);
</span><del>- settings.setScreenFontSubstitutionEnabled(
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- [[NSUserDefaults standardUserDefaults] boolForKey:@"NSFontDefaultScreenFontSubstitutionEnabled"] ||
-#endif
- [preferences screenFontSubstitutionEnabled]
- );
</del><span class="cx"> settings.setForceFTPDirectoryListings([preferences _forceFTPDirectoryListings]);
</span><span class="cx"> settings.setFTPDirectoryTemplatePath([preferences _ftpDirectoryTemplatePath]);
</span><span class="cx"> settings.setLocalStorageDatabasePath([preferences _localStorageDatabasePath]);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ * WebPreferenceKeysPrivate.h:
+ * WebPreferences.cpp:
+ (WebPreferences::screenFontSubstitutionEnabled):
+ (WebPreferences::setScreenFontSubstitutionEnabled):
+ Remove implementations. Have this setting set on windows didn't have any effect before,
+ so this doesn't change behavior.
+
</ins><span class="cx"> 2015-01-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up / modernize PageCache class
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -161,6 +161,4 @@
</span><span class="cx">
</span><span class="cx"> #define WebKitMockScrollbarsEnabledPreferenceKey "WebKitMockScrollbarsEnabled"
</span><span class="cx">
</span><del>-#define WebKitScreenFontSubstitutionEnabledPreferenceKey "WebKitScreenFontSubstitutionEnabledPreferenceKey"
-
</del><span class="cx"> #define WebKitEnableInheritURIQueryComponentPreferenceKey "WebKitEnableInheritURIQueryComponent"
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1278,15 +1278,13 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebPreferences::screenFontSubstitutionEnabled(BOOL* enabled)
</del><ins>+HRESULT WebPreferences::screenFontSubstitutionEnabled(BOOL*)
</ins><span class="cx"> {
</span><del>- *enabled = boolValueForKey(WebKitScreenFontSubstitutionEnabledPreferenceKey);
</del><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebPreferences::setScreenFontSubstitutionEnabled(BOOL enabled)
</del><ins>+HRESULT WebPreferences::setScreenFontSubstitutionEnabled(BOOL)
</ins><span class="cx"> {
</span><del>- setBoolValue(WebKitScreenFontSubstitutionEnabledPreferenceKey, enabled);
</del><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKPreferencesSetScreenFontSubstitutionEnabled):
+ (WKPreferencesGetScreenFontSubstitutionEnabled):
+ Move now empty preferences SPI to WKDeprecatedFunctions.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetScreenFontSubstitutionEnabled): Deleted.
+ (WKPreferencesGetScreenFontSubstitutionEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::presenterApplicationPid):
+ (WebKit::WebProcess::shouldForceScreenFontSubstitution): Deleted.
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ Stop piping screen font substitution setting to the web process.
+
</ins><span class="cx"> 2015-01-29 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Frequent kernel panics when running WebKit regression tests
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef);
</span><span class="cx">
</span><ins>+WK_EXPORT void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef);
+
</ins><span class="cx"> WK_EXPORT bool WKInspectorIsDebuggingJavaScript(WKInspectorRef);
</span><span class="cx"> WK_EXPORT void WKInspectorToggleJavaScriptDebugging(WKInspectorRef);
</span><span class="cx">
</span><span class="lines">@@ -106,6 +109,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef)
+{
+ return false;
+}
+
</ins><span class="cx"> bool WKInspectorIsDebuggingJavaScript(WKInspectorRef)
</span><span class="cx"> {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -38,12 +38,6 @@
</span><span class="cx"> #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
-#else
-#define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_DOM_TIMER_THROTTLING_ENABLED true
</span><span class="cx"> #define DEFAULT_HIDDEN_PAGE_CSS_ANIMATION_SUSPENSION_ENABLED true
</span><span class="lines">@@ -162,7 +156,6 @@
</span><span class="cx"> macro(ScrollingPerformanceLoggingEnabled, scrollingPerformanceLoggingEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
</span><span class="cx"> macro(ForceUpdateScrollbarsOnMainThreadForPerformanceTesting, forceUpdateScrollbarsOnMainThreadForPerformanceTesting, Bool, bool, false) \
</span><del>- macro(ScreenFontSubstitutionEnabled, screenFontSubstitutionEnabled, Bool, bool, DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED) \
</del><span class="cx"> macro(CookieEnabled, cookieEnabled, Bool, bool, true) \
</span><span class="cx"> macro(PlugInSnapshottingEnabled, plugInSnapshottingEnabled, Bool, bool, false) \
</span><span class="cx"> macro(SnapshotAllPlugIns, snapshotAllPlugIns, Bool, bool, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> , nsURLCacheMemoryCapacity(0)
</span><span class="cx"> , nsURLCacheDiskCapacity(0)
</span><del>- , shouldForceScreenFontSubstitution(false)
</del><span class="cx"> , shouldEnableKerningAndLigaturesByDefault(false)
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><span class="lines">@@ -118,7 +117,6 @@
</span><span class="cx"> encoder << acceleratedCompositingPort;
</span><span class="cx"> encoder << uiProcessBundleResourcePath;
</span><span class="cx"> encoder << uiProcessBundleResourcePathExtensionHandle;
</span><del>- encoder << shouldForceScreenFontSubstitution;
</del><span class="cx"> encoder << shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> encoder << shouldEnableJIT;
</span><span class="cx"> encoder << shouldEnableFTLJIT;
</span><span class="lines">@@ -253,8 +251,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.uiProcessBundleResourcePathExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.shouldForceScreenFontSubstitution))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.shouldEnableJIT))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -139,7 +139,6 @@
</span><span class="cx"> String uiProcessBundleResourcePath;
</span><span class="cx"> SandboxExtension::Handle uiProcessBundleResourcePathExtensionHandle;
</span><span class="cx">
</span><del>- bool shouldForceScreenFontSubstitution;
</del><span class="cx"> bool shouldEnableKerningAndLigaturesByDefault;
</span><span class="cx"> bool shouldEnableJIT;
</span><span class="cx"> bool shouldEnableFTLJIT;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -298,16 +298,7 @@
</span><span class="cx"> return toImpl(preferencesRef)->minimumFontSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- toImpl(preferencesRef)->setScreenFontSubstitutionEnabled(enabled);
-}
</del><span class="cx">
</span><del>-bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->screenFontSubstitutionEnabled();
-}
-
</del><span class="cx"> void WKPreferencesSetCookieEnabled(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><span class="cx"> toImpl(preferencesRef)->setCookieEnabled(enabled);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -225,10 +225,6 @@
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetScrollingPerformanceLoggingEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">
</span><span class="cx"> // Defaults to true
</span><del>-WK_EXPORT void WKPreferencesSetScreenFontSubstitutionEnabled(WKPreferencesRef preferences, bool enabled);
-WK_EXPORT bool WKPreferencesGetScreenFontSubstitutionEnabled(WKPreferencesRef preferences);
-
-// Defaults to true
</del><span class="cx"> WK_EXPORT void WKPreferencesSetCookieEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetCookieEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -189,9 +189,6 @@
</span><span class="cx"> parameters.nsURLCacheMemoryCapacity = [urlCache memoryCapacity];
</span><span class="cx"> parameters.nsURLCacheDiskCapacity = [urlCache diskCapacity];
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
- parameters.shouldForceScreenFontSubstitution = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSFontDefaultScreenFontSubstitutionEnabled"];
-#endif
</del><span class="cx"> parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
</span><span class="cx"> parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -2743,11 +2743,6 @@
</span><span class="cx"> settings.setMinimumLogicalFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
</span><span class="cx"> settings.setDefaultFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFontSizeKey()));
</span><span class="cx"> settings.setDefaultFixedFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
</span><del>- settings.setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
-#if PLATFORM(COCOA)
- || WebProcess::shared().shouldForceScreenFontSubstitution()
-#endif
- );
</del><span class="cx"> settings.setLayoutFallbackWidth(store.getUInt32ValueForKey(WebPreferencesKey::layoutFallbackWidthKey()));
</span><span class="cx"> settings.setDeviceWidth(store.getUInt32ValueForKey(WebPreferencesKey::deviceWidthKey()));
</span><span class="cx"> settings.setDeviceHeight(store.getUInt32ValueForKey(WebPreferencesKey::deviceHeightKey()));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> pid_t presenterApplicationPid() const { return m_presenterApplicationPid; }
</span><del>- bool shouldForceScreenFontSubstitution() const { return m_shouldForceScreenFontSubstitution; }
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
</span><span class="lines">@@ -327,7 +326,6 @@
</span><span class="cx"> WebCore::MachSendRight m_compositingRenderServerPort;
</span><span class="cx"> pid_t m_presenterApplicationPid;
</span><span class="cx"> dispatch_group_t m_clearResourceCachesDispatchGroup;
</span><del>- bool m_shouldForceScreenFontSubstitution;
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_fullKeyboardAccessEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -193,7 +193,6 @@
</span><span class="cx">
</span><span class="cx"> m_compositingRenderServerPort = WTF::move(parameters.acceleratedCompositingPort);
</span><span class="cx"> m_presenterApplicationPid = parameters.presenterApplicationPid;
</span><del>- m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
</del><span class="cx"> FontCascade::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
</span><span class="cx">
</span><span class="cx"> MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Tools/ChangeLog 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-29 Sam Weinig <sam@webkit.org>
+
+ Remove support for screen font substitution
+ https://bugs.webkit.org/show_bug.cgi?id=141038
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+ Remove call to now setScreenFontSubstitutionEnabled() which is a no-op.
+
</ins><span class="cx"> 2015-01-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make run-jsc-stress-tests --remote work on Linux too
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (179367 => 179368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-29 22:14:31 UTC (rev 179367)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-01-29 22:40:17 UTC (rev 179368)
</span><span class="lines">@@ -842,7 +842,6 @@
</span><span class="cx"> prefsPrivate->setMockScrollbarsEnabled(TRUE);
</span><span class="cx">
</span><span class="cx"> preferences->setFontSmoothing(FontSmoothingTypeStandard);
</span><del>- prefsPrivate->setScreenFontSubstitutionEnabled(TRUE);
</del><span class="cx">
</span><span class="cx"> setAlwaysAcceptCookies(false);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>