<!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>[191250] trunk/Source</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/191250">191250</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-10-17 15:31:36 -0700 (Sat, 17 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stop honoring the user default &quot;WebKitKerningAndLigaturesEnabledByDefault&quot;
https://bugs.webkit.org/show_bug.cgi?id=150287

Reviewed by Simon Fraser.

Source/WebCore:

This user default is currently on by default. Therefore, by setting the user default,
users can only disable kerning / ligatures (rather than enable it).

There are a few reasons why we should stop honoring it:

1. In the brave new world of font-feature-settings and font-variant-ligatures, there
are many different kinds of ligatures which may be enabled at will. The simplistic
statement of &quot;turn on ligatures&quot; no longer has any meaning.

2. If a user wants to disable kerning / ligatures, he/she can do it with a user
stylesheet.

3. The default isn't able to be tested with DumpRenderTree or WebKitTestRunner.

4. I have never heard of anyone actually using this user default.

* platform/graphics/FontCascade.cpp:
(WebCore::FontCascade::setDefaultKerning): Deleted.
(WebCore::FontCascade::setDefaultLigatures): Deleted.
* platform/graphics/FontCascade.h:
(WebCore::FontCascade::advancedTextRenderingMode):

Source/WebKit/mac:

* WebView/WebView.mm:
(+[WebView initialize]): Deleted.

Source/WebKit2:

* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
(WebKit::WebProcessCreationParameters::encode): Deleted.
(WebKit::WebProcessCreationParameters::decode): Deleted.
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::registerUserDefaultsIfNeeded): Deleted.
(WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebCore/ChangeLog        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-17  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Stop honoring the user default &quot;WebKitKerningAndLigaturesEnabledByDefault&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=150287
+
+        Reviewed by Simon Fraser.
+
+        This user default is currently on by default. Therefore, by setting the user default,
+        users can only disable kerning / ligatures (rather than enable it).
+
+        There are a few reasons why we should stop honoring it:
+
+        1. In the brave new world of font-feature-settings and font-variant-ligatures, there
+        are many different kinds of ligatures which may be enabled at will. The simplistic
+        statement of &quot;turn on ligatures&quot; no longer has any meaning.
+
+        2. If a user wants to disable kerning / ligatures, he/she can do it with a user
+        stylesheet.
+
+        3. The default isn't able to be tested with DumpRenderTree or WebKitTestRunner.
+
+        4. I have never heard of anyone actually using this user default.
+
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::setDefaultKerning): Deleted.
+        (WebCore::FontCascade::setDefaultLigatures): Deleted.
+        * platform/graphics/FontCascade.h:
+        (WebCore::FontCascade::advancedTextRenderingMode):
+
</ins><span class="cx"> 2015-10-17  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Stop using WKAXRegisterRemoteApp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -92,9 +92,6 @@
</span><span class="cx"> 
</span><span class="cx"> FontCascade::CodePath FontCascade::s_codePath = Auto;
</span><span class="cx"> 
</span><del>-bool FontCascade::s_defaultKerning = false;
-bool FontCascade::s_defaultLigatures = false;
-
</del><span class="cx"> // ============================================================================================
</span><span class="cx"> // FontCascade Implementation (Cross-Platform Portion)
</span><span class="cx"> // ============================================================================================
</span><span class="lines">@@ -587,16 +584,6 @@
</span><span class="cx">     return s_codePath;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FontCascade::setDefaultKerning(bool enable)
-{
-    s_defaultKerning = enable;
-}
-
-void FontCascade::setDefaultLigatures(bool enable)
-{
-    s_defaultLigatures = enable;
-}
-
</del><span class="cx"> FontCascade::CodePath FontCascade::codePath(const TextRun&amp; run) const
</span><span class="cx"> {
</span><span class="cx">     if (s_codePath != Auto)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -265,8 +265,6 @@
</span><span class="cx">     static CodePath codePath();
</span><span class="cx">     static CodePath s_codePath;
</span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT static void setDefaultKerning(bool);
-    WEBCORE_EXPORT static void setDefaultLigatures(bool);
</del><span class="cx">     static const uint8_t s_roundingHackCharacterTable[256];
</span><span class="cx">     static bool isRoundingHackCharacter(UChar32 c)
</span><span class="cx">     {
</span><span class="lines">@@ -306,7 +304,7 @@
</span><span class="cx">             return true;
</span><span class="cx">         if (textRenderingMode == OptimizeSpeed)
</span><span class="cx">             return false;
</span><del>-        return s_defaultKerning;
</del><ins>+        return true;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     bool computeEnableKerning() const
</span><span class="lines">@@ -329,9 +327,6 @@
</span><span class="cx">         return advancedTextRenderingMode();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    static bool s_defaultKerning;
-    static bool s_defaultLigatures;
-
</del><span class="cx">     FontCascadeDescription m_fontDescription;
</span><span class="cx">     mutable RefPtr&lt;FontCascadeFonts&gt; m_fonts;
</span><span class="cx">     WeakPtrFactory&lt;FontCascade&gt; m_weakPtrFactory;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-10-17  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Stop honoring the user default &quot;WebKitKerningAndLigaturesEnabledByDefault&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=150287
+
+        Reviewed by Simon Fraser.
+
+        * WebView/WebView.mm:
+        (+[WebView initialize]): Deleted.
+
</ins><span class="cx"> 2015-10-16  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WebEditingDelegate should be a formal protocol
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -624,8 +624,6 @@
</span><span class="cx"> NSString *_WebViewRemoteInspectorHasSessionChangedNotification = @&quot;_WebViewRemoteInspectorHasSessionChangedNotification&quot;;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @&quot;WebKitKerningAndLigaturesEnabledByDefault&quot;;
-
</del><span class="cx"> @interface WebProgressItem : NSObject
</span><span class="cx"> {
</span><span class="cx"> @public
</span><span class="lines">@@ -4697,7 +4695,6 @@
</span><span class="cx">     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_preferencesRemovedNotification:) name:WebPreferencesRemovedNotification object:nil];
</span><span class="cx"> 
</span><span class="cx">     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><del>-    [defaults registerDefaults:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey]];
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     continuousSpellCheckingEnabled = NO;
</span><span class="lines">@@ -4708,10 +4705,6 @@
</span><span class="cx">     grammarCheckingEnabled = [defaults boolForKey:WebGrammarCheckingEnabled];
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    bool defaultKerningAndLigatures = [defaults boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
-    FontCascade::setDefaultKerning(defaultKerningAndLigatures);
-    FontCascade::setDefaultLigatures(defaultKerningAndLigatures);
-
</del><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     automaticQuoteSubstitutionEnabled = [self _shouldAutomaticQuoteSubstitutionBeEnabled];
</span><span class="cx">     automaticLinkDetectionEnabled = [defaults boolForKey:WebAutomaticLinkDetectionEnabled];
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit2/ChangeLog        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-17  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+        Stop honoring the user default &quot;WebKitKerningAndLigaturesEnabledByDefault&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=150287
+
+        Reviewed by Simon Fraser.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters): Deleted.
+        (WebKit::WebProcessCreationParameters::encode): Deleted.
+        (WebKit::WebProcessCreationParameters::decode): Deleted.
+        * Shared/WebProcessCreationParameters.h:
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::registerUserDefaultsIfNeeded): Deleted.
+        (WebKit::WebProcessPool::platformInitializeWebProcess): Deleted.
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess): Deleted.
+
</ins><span class="cx"> 2015-10-17  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Stop using WKAXRegisterRemoteApp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -40,8 +40,6 @@
</span><span class="cx">     , shouldUseFontSmoothing(true)
</span><span class="cx">     , defaultRequestTimeoutInterval(INT_MAX)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    , shouldEnableKerningByDefault(false)
-    , shouldEnableLigaturesByDefault(false)
</del><span class="cx">     , shouldEnableJIT(false)
</span><span class="cx">     , shouldEnableFTLJIT(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -123,8 +121,6 @@
</span><span class="cx">     encoder &lt;&lt; acceleratedCompositingPort;
</span><span class="cx">     encoder &lt;&lt; uiProcessBundleResourcePath;
</span><span class="cx">     encoder &lt;&lt; uiProcessBundleResourcePathExtensionHandle;
</span><del>-    encoder &lt;&lt; shouldEnableKerningByDefault;
-    encoder &lt;&lt; shouldEnableLigaturesByDefault;
</del><span class="cx">     encoder &lt;&lt; shouldEnableJIT;
</span><span class="cx">     encoder &lt;&lt; shouldEnableFTLJIT;
</span><span class="cx">     encoder &lt;&lt; !!bundleParameterData;
</span><span class="lines">@@ -269,10 +265,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.shouldEnableKerningByDefault))
-        return false;
-    if (!decoder.decode(parameters.shouldEnableLigaturesByDefault))
-        return false;
</del><span class="cx">     if (!decoder.decode(parameters.shouldEnableJIT))
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(parameters.shouldEnableFTLJIT))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -142,8 +142,6 @@
</span><span class="cx">     String uiProcessBundleResourcePath;
</span><span class="cx">     SandboxExtension::Handle uiProcessBundleResourcePathExtensionHandle;
</span><span class="cx"> 
</span><del>-    bool shouldEnableKerningByDefault;
-    bool shouldEnableLigaturesByDefault;
</del><span class="cx">     bool shouldEnableJIT;
</span><span class="cx">     bool shouldEnableFTLJIT;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> NSString *WebDatabaseDirectoryDefaultsKey = @&quot;WebDatabaseDirectory&quot;;
</span><span class="cx"> NSString *WebKitLocalCacheDefaultsKey = @&quot;WebKitLocalCache&quot;;
</span><span class="cx"> NSString *WebStorageDirectoryDefaultsKey = @&quot;WebKitLocalStorageDatabasePathPreferenceKey&quot;;
</span><del>-NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @&quot;WebKitKerningAndLigaturesEnabledByDefault&quot;;
</del><span class="cx"> NSString *WebKitJSCJITEnabledDefaultsKey = @&quot;WebKitJSCJITEnabledDefaultsKey&quot;;
</span><span class="cx"> NSString *WebKitJSCFTLJITEnabledDefaultsKey = @&quot;WebKitJSCFTLJITEnabledDefaultsKey&quot;;
</span><span class="cx"> NSString *WebKitMediaKeysStorageDirectoryDefaultsKey = @&quot;WebKitMediaKeysStorageDirectory&quot;;
</span><span class="lines">@@ -102,10 +101,6 @@
</span><span class="cx">     
</span><span class="cx">     [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx">     [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><del>-    
-#if PLATFORM(COCOA)
-    [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">     [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitNetworkCacheEnabledDefaultsKey];
</span><span class="lines">@@ -175,9 +170,6 @@
</span><span class="cx">     parameters.accessibilityEnhancedUserInterfaceEnabled = false;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    bool shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
-    parameters.shouldEnableKerningByDefault = shouldEnableKerningAndLigaturesByDefault;
-    parameters.shouldEnableLigaturesByDefault = shouldEnableKerningAndLigaturesByDefault;
</del><span class="cx">     parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
</span><span class="cx">     parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><span class="cx">     parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@&quot;LogMemoryJetsamDetails&quot;];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (191249 => 191250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2015-10-17 21:32:28 UTC (rev 191249)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm        2015-10-17 22:31:36 UTC (rev 191250)
</span><span class="lines">@@ -152,8 +152,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>-    FontCascade::setDefaultKerning(parameters.shouldEnableKerningByDefault);
-    FontCascade::setDefaultLigatures(parameters.shouldEnableLigaturesByDefault);
</del><span class="cx"> 
</span><span class="cx">     MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>