<!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>[178124] 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/178124">178124</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 12:24:52 -0800 (Thu, 08 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page
https://bugs.webkit.org/show_bug.cgi?id=140232
&lt;rdar://problem/19371010&gt;

Reviewed by Anders Carlsson.

Source/WebCore:

We need to support default button styling even when application chrome
mode is not enabled (it was a bit weird that this was exposed as a Setting
anyway). We should render as a default button whenever content sets
the proprietary -webkit-appearance. This means we don't need the
applicationChromeMode setting.

For normal Web content there should be no change in behavior.

* page/Settings.in: Remove applicationChromeMode
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::isDefault): Don't test for the setting.

Source/WebKit/mac:

Remove the applicationChromeMode setting, but leave stubs in to make
sure existing binaries don't break.

* WebCoreSupport/WebInspectorClient.mm:
(-[WebInspectorWindowController init]):
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences applicationChromeModeEnabled]):
(-[WebPreferences setApplicationChromeModeEnabled:]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit/win:

Remove the applicationChromeMode setting, but leave stubs in to make
sure existing binaries don't break.

* WebPreferences.cpp:
(WebPreferences::initializeDefaultSettings):
(WebPreferences::inApplicationChromeMode):
(WebPreferences::setApplicationChromeMode):
* WebView.cpp:
(WebView::notifyPreferencesChanged):

Source/WebKit2:

Remove the applicationChromeMode setting, but leave stubs in to make
sure existing binaries don't break.

* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKPreferencesSetApplicationChromeModeEnabled):
(WKPreferencesGetApplicationChromeModeEnabled):
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetApplicationChromeModeEnabled): Deleted.
(WKPreferencesGetApplicationChromeModeEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorPageGroups::createInspectorPageGroup):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.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="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.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="#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="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebCore/ChangeLog        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-08  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page
+        https://bugs.webkit.org/show_bug.cgi?id=140232
+        &lt;rdar://problem/19371010&gt;
+
+        Reviewed by Anders Carlsson.
+
+        We need to support default button styling even when application chrome
+        mode is not enabled (it was a bit weird that this was exposed as a Setting
+        anyway). We should render as a default button whenever content sets
+        the proprietary -webkit-appearance. This means we don't need the
+        applicationChromeMode setting.
+
+        For normal Web content there should be no change in behavior.
+
+        * page/Settings.in: Remove applicationChromeMode
+        * rendering/RenderTheme.cpp:
+        (WebCore::RenderTheme::isDefault): Don't test for the setting.
+
</ins><span class="cx"> 2015-01-08  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unfriend StyleResolver and StyleBuilderCustom
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebCore/page/Settings.in        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -155,7 +155,6 @@
</span><span class="cx"> syncXHRInDocumentsEnabled initial=true
</span><span class="cx"> cookieEnabled initial=true
</span><span class="cx"> mediaEnabled initial=true
</span><del>-applicationChromeMode initial=false
</del><span class="cx"> DOMPasteAllowed initial=false
</span><span class="cx"> 
</span><span class="cx"> # When enabled, window.blur() does not change focus, and
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -874,9 +874,6 @@
</span><span class="cx">     if (!isActive(o))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    if (!o.frame().settings().applicationChromeMode())
-        return false;
-    
</del><span class="cx">     return o.style().appearance() == DefaultButtonPart;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/mac/ChangeLog        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-08  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page
+        https://bugs.webkit.org/show_bug.cgi?id=140232
+        &lt;rdar://problem/19371010&gt;
+
+        Reviewed by Anders Carlsson.
+
+        Remove the applicationChromeMode setting, but leave stubs in to make
+        sure existing binaries don't break.
+
+        * WebCoreSupport/WebInspectorClient.mm:
+        (-[WebInspectorWindowController init]):
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences applicationChromeModeEnabled]):
+        (-[WebPreferences setApplicationChromeModeEnabled:]):
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2015-01-07  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Make WebKit2 build with public iOS SDK and more build fixes for DRT
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebInspectorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -395,7 +395,6 @@
</span><span class="cx"> 
</span><span class="cx">     WebPreferences *preferences = [[WebPreferences alloc] init];
</span><span class="cx">     [preferences setAllowsAnimatedImages:YES];
</span><del>-    [preferences setApplicationChromeModeEnabled:YES];
</del><span class="cx">     [preferences setAuthorAndUserStylesEnabled:YES];
</span><span class="cx">     [preferences setAutosaves:NO];
</span><span class="cx">     [preferences setDefaultFixedFontSize:11];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -86,7 +86,6 @@
</span><span class="cx"> #define WebKitDeveloperExtrasEnabledPreferenceKey @&quot;WebKitDeveloperExtrasEnabledPreferenceKey&quot;
</span><span class="cx"> #define WebKitJavaScriptExperimentsEnabledPreferenceKey @&quot;WebKitJavaScriptExperimentsEnabledPreferenceKey&quot;
</span><span class="cx"> #define WebKitAuthorAndUserStylesEnabledPreferenceKey @&quot;WebKitAuthorAndUserStylesEnabledPreferenceKey&quot;
</span><del>-#define WebKitApplicationChromeModeEnabledPreferenceKey @&quot;WebKitApplicationChromeModeEnabledPreferenceKey&quot;
</del><span class="cx"> #define WebKitDOMTimersThrottlingEnabledPreferenceKey @&quot;WebKitDOMTimersThrottlingEnabledPreferenceKey&quot;
</span><span class="cx"> #define WebKitWebArchiveDebugModeEnabledPreferenceKey @&quot;WebKitWebArchiveDebugModeEnabledPreferenceKey&quot;
</span><span class="cx"> #define WebKitLocalFileContentSniffingEnabledPreferenceKey @&quot;WebKitLocalFileContentSniffingEnabledPreferenceKey&quot;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -475,7 +475,6 @@
</span><span class="cx">         [NSNumber numberWithBool:NO],   WebKitDeveloperExtrasEnabledPreferenceKey,
</span><span class="cx">         [NSNumber numberWithBool:NO],   WebKitJavaScriptExperimentsEnabledPreferenceKey,
</span><span class="cx">         [NSNumber numberWithBool:YES],  WebKitAuthorAndUserStylesEnabledPreferenceKey,
</span><del>-        [NSNumber numberWithBool:NO],   WebKitApplicationChromeModeEnabledPreferenceKey,
</del><span class="cx">         [NSNumber numberWithBool:YES],  WebKitDOMTimersThrottlingEnabledPreferenceKey,
</span><span class="cx">         [NSNumber numberWithBool:NO],   WebKitWebArchiveDebugModeEnabledPreferenceKey,
</span><span class="cx">         [NSNumber numberWithBool:NO],   WebKitLocalFileContentSniffingEnabledPreferenceKey,
</span><span class="lines">@@ -1216,14 +1215,14 @@
</span><span class="cx">     [self _setBoolValue:flag forKey:WebKitAuthorAndUserStylesEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// FIXME: applicationChromeMode is no longer needed by ToT, but is still used in Safari 8.
</ins><span class="cx"> - (BOOL)applicationChromeModeEnabled
</span><span class="cx"> {
</span><del>-    return [self _boolValueForKey:WebKitApplicationChromeModeEnabledPreferenceKey];
</del><ins>+    return NO;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)setApplicationChromeModeEnabled:(BOOL)flag
</span><span class="cx"> {
</span><del>-    [self _setBoolValue:flag forKey:WebKitApplicationChromeModeEnabledPreferenceKey];
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (BOOL)domTimersThrottlingEnabled
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -2265,7 +2265,6 @@
</span><span class="cx">     settings.setDeveloperExtrasEnabled([preferences developerExtrasEnabled]);
</span><span class="cx">     settings.setJavaScriptExperimentsEnabled([preferences javaScriptExperimentsEnabled]);
</span><span class="cx">     settings.setAuthorAndUserStylesEnabled([preferences authorAndUserStylesEnabled]);
</span><del>-    settings.setApplicationChromeMode([preferences applicationChromeModeEnabled]);
</del><span class="cx"> 
</span><span class="cx">     settings.setNeedsSiteSpecificQuirks(_private-&gt;useSiteSpecificSpoofing);
</span><span class="cx">     settings.setDOMTimersThrottlingEnabled([preferences domTimersThrottlingEnabled]);
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/win/ChangeLog        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-01-08  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page
+        https://bugs.webkit.org/show_bug.cgi?id=140232
+        &lt;rdar://problem/19371010&gt;
+
+        Reviewed by Anders Carlsson.
+
+        Remove the applicationChromeMode setting, but leave stubs in to make
+        sure existing binaries don't break.
+
+        * WebPreferences.cpp:
+        (WebPreferences::initializeDefaultSettings):
+        (WebPreferences::inApplicationChromeMode):
+        (WebPreferences::setApplicationChromeMode):
+        * WebView.cpp:
+        (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2015-01-07  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Win] WindowCloseTimer is an ActiveDOMObject and must call suspendIfNeeded
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/win/WebPreferences.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -264,7 +264,6 @@
</span><span class="cx">     CFDictionaryAddValue(defaults, CFSTR(WebKitCacheModelPreferenceKey), cacheModelRef.get());
</span><span class="cx"> 
</span><span class="cx">     CFDictionaryAddValue(defaults, CFSTR(WebKitAuthorAndUserStylesEnabledPreferenceKey), kCFBooleanTrue);
</span><del>-    CFDictionaryAddValue(defaults, CFSTR(WebKitApplicationChromeModePreferenceKey), kCFBooleanFalse);
</del><span class="cx"> 
</span><span class="cx">     CFDictionaryAddValue(defaults, CFSTR(WebKitOfflineWebApplicationCacheEnabledPreferenceKey), kCFBooleanFalse);
</span><span class="cx"> 
</span><span class="lines">@@ -1472,15 +1471,13 @@
</span><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-HRESULT WebPreferences::inApplicationChromeMode(BOOL* enabled)
</del><ins>+HRESULT WebPreferences::inApplicationChromeMode(BOOL*)
</ins><span class="cx"> {
</span><del>-    *enabled = boolValueForKey(WebKitApplicationChromeModePreferenceKey);
</del><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><del>-    
-HRESULT WebPreferences::setApplicationChromeMode(BOOL enabled)
</del><ins>+
+HRESULT WebPreferences::setApplicationChromeMode(BOOL)
</ins><span class="cx"> {
</span><del>-    setBoolValue(WebKitApplicationChromeModePreferenceKey, enabled);
</del><span class="cx">     return S_OK;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit/win/WebView.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -4951,11 +4951,6 @@
</span><span class="cx">         settings.setAuthorAndUserStylesEnabled(enabled);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    hr = prefsPrivate-&gt;inApplicationChromeMode(&amp;enabled);
-    if (FAILED(hr))
-        return hr;
-    settings.setApplicationChromeMode(enabled);
-
</del><span class="cx">     hr = prefsPrivate-&gt;offlineWebApplicationCacheEnabled(&amp;enabled);
</span><span class="cx">     if (FAILED(hr))
</span><span class="cx">         return hr;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/ChangeLog        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-08  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Text not drawn or white-on-white for &quot;Close Page&quot;/&quot;Go Back&quot; button on safe browsing warning page
+        https://bugs.webkit.org/show_bug.cgi?id=140232
+        &lt;rdar://problem/19371010&gt;
+
+        Reviewed by Anders Carlsson.
+
+        Remove the applicationChromeMode setting, but leave stubs in to make
+        sure existing binaries don't break.
+
+        * Shared/API/c/WKDeprecatedFunctions.cpp:
+        (WKPreferencesSetApplicationChromeModeEnabled):
+        (WKPreferencesGetApplicationChromeModeEnabled):
+        * Shared/WebPreferencesDefinitions.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetApplicationChromeModeEnabled): Deleted.
+        (WKPreferencesGetApplicationChromeModeEnabled): Deleted.
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorPageGroups::createInspectorPageGroup):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2015-01-08  Gwang Yoon Hwang  &lt;yoon@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ThreadedCompositor] Update active animations without interrupting the main-thread
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetRegionBasedColumnsEnabled(WKPreferencesRef);
</span><span class="cx"> 
</span><ins>+WK_EXPORT void WKPreferencesSetApplicationChromeModeEnabled(WKPreferencesRef, bool);
+WK_EXPORT bool WKPreferencesGetApplicationChromeModeEnabled(WKPreferencesRef);
+
</ins><span class="cx"> WK_EXPORT void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef, bool);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef);
</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 WKPreferencesSetApplicationChromeModeEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetApplicationChromeModeEnabled(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 (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx">     macro(ShowsToolTipOverTruncatedText, showsToolTipOverTruncatedText, Bool, bool, false) \
</span><span class="cx">     macro(MockScrollbarsEnabled, mockScrollbarsEnabled, Bool, bool, false) \
</span><span class="cx">     macro(WebAudioEnabled, webAudioEnabled, Bool, bool, true) \
</span><del>-    macro(ApplicationChromeModeEnabled, applicationChromeMode, Bool, bool, false) \
</del><span class="cx">     macro(SuppressesIncrementalRendering, suppressesIncrementalRendering, Bool, bool, false) \
</span><span class="cx">     macro(BackspaceKeyNavigationEnabled, backspaceKeyNavigationEnabled, Bool, bool, true) \
</span><span class="cx">     macro(CaretBrowsingEnabled, caretBrowsingEnabled, Bool, bool, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -787,16 +787,6 @@
</span><span class="cx">     return toImpl(preferencesRef)-&gt;webAudioEnabled();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WKPreferencesSetApplicationChromeModeEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
-    toImpl(preferencesRef)-&gt;setApplicationChromeModeEnabled(enabled);
-}
-
-bool WKPreferencesGetApplicationChromeModeEnabled(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)-&gt;applicationChromeMode();
-}
-
</del><span class="cx"> void WKPreferencesSetInspectorUsesWebKitUserInterface(WKPreferencesRef, bool)
</span><span class="cx"> {
</span><span class="cx">     // FIXME: Remove once WebKit nightlies don't need to support Safari 6 thru 7.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -180,10 +180,6 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMockScrollbarsEnabled(WKPreferencesRef preferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMockScrollbarsEnabled(WKPreferencesRef preferencesRef);
</span><span class="cx">     
</span><del>-// Defaults to false.
-WK_EXPORT void WKPreferencesSetApplicationChromeModeEnabled(WKPreferencesRef preferencesRef, bool enabled);
-WK_EXPORT bool WKPreferencesGetApplicationChromeModeEnabled(WKPreferencesRef preferencesRef);
-
</del><span class="cx"> // Deprecated. Always returns false.
</span><span class="cx"> WK_EXPORT void WKPreferencesSetInspectorUsesWebKitUserInterface(WKPreferencesRef preferencesRef, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetInspectorUsesWebKitUserInterface(WKPreferencesRef preferencesRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -109,7 +109,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         pageGroup-&gt;preferences().setAllowFileAccessFromFileURLs(true);
</span><del>-        pageGroup-&gt;preferences().setApplicationChromeModeEnabled(true);
</del><span class="cx"> 
</span><span class="cx">         return pageGroup.release();
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (178123 => 178124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2015-01-08 20:05:15 UTC (rev 178123)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2015-01-08 20:24:52 UTC (rev 178124)
</span><span class="lines">@@ -2807,7 +2807,6 @@
</span><span class="cx">     settings.setMediaPlaybackAllowsAirPlay(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsAirPlayKey()));
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    settings.setApplicationChromeMode(store.getBoolValueForKey(WebPreferencesKey::applicationChromeModeKey()));
</del><span class="cx">     settings.setSuppressesIncrementalRendering(store.getBoolValueForKey(WebPreferencesKey::suppressesIncrementalRenderingKey()));
</span><span class="cx">     settings.setIncrementalRenderingSuppressionTimeoutInSeconds(store.getDoubleValueForKey(WebPreferencesKey::incrementalRenderingSuppressionTimeoutKey()));
</span><span class="cx">     settings.setBackspaceKeyNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::backspaceKeyNavigationEnabledKey()));
</span></span></pre>
</div>
</div>

</body>
</html>