<!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>[186539] branches/safari-600.1.4.17-branch</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/186539">186539</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 16:50:02 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186232">r186232</a>. rdar://problem/9091261</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchLayoutTestsChangeLog">branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchLayoutTestsloadermetarefreshdisabledhtml">branches/safari-600.1.4.17-branch/LayoutTests/loader/meta-refresh-disabled.html</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreChangeLog">branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoredomDocumentcpp">branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCorepageSettingsin">branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh">branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacWebViewWebPreferencesmm">branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacWebViewWebPreferencesPrivateh">branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2ChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2SharedWebPreferencesDefinitionsh">branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPICWKPreferencescpp">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-08 Lucas Forschler <lforschler@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beidson@apple.com>
+
+ Add preference to disable all http-equiv.
+ <rdar://problem/9091261> and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+ Reviewed by Sam Weinig.
+
+ * loader/meta-refresh-disabled.html:
+
</ins><span class="cx"> 2015-07-08 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r186388. rdar://problem/21708243
</span></span></pre></div>
<a id="branchessafari6001417branchLayoutTestsloadermetarefreshdisabledhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/LayoutTests/loader/meta-refresh-disabled.html (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/LayoutTests/loader/meta-refresh-disabled.html 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/LayoutTests/loader/meta-refresh-disabled.html 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <script>
</span><span class="cx"> if (window.testRunner) {
</span><del>- testRunner.overridePreference("WebKitMetaRefreshEnabled", "0");
</del><ins>+ testRunner.overridePreference("WebKitHTTPEquivEnabled", "0");
</ins><span class="cx"> testRunner.dumpAsText();
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1,4 +1,21 @@
</span><span class="cx"> 2015-07-08 Lucas Forschler <lforschler@apple.com>
</span><ins>+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beidson@apple.com>
+
+ Add preference to disable all http-equiv.
+ <rdar://problem/9091261> and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+ Reviewed by Sam Weinig.
+
+ No new tests (Covered by existing test)
+
+ * dom/Document.cpp:
+ (WebCore::Document::processHttpEquiv):
+ * page/Settings.in:
+
+2015-07-08 Lucas Forschler <lforschler@apple.com>
</ins><span class="cx">
</span><span class="cx"> Merge change for rdar://problem/21533232
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -2807,6 +2807,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!equiv.isNull() && !content.isNull());
</span><span class="cx">
</span><ins>+ if (page() && !page()->settings().httpEquivEnabled())
+ return;
+
</ins><span class="cx"> Frame* frame = this->frame();
</span><span class="cx">
</span><span class="cx"> HTTPHeaderName headerName;
</span><span class="lines">@@ -2827,9 +2830,6 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case HTTPHeaderName::Refresh: {
</span><del>- if (page() && !page()->settings().metaRefreshEnabled())
- break;
-
</del><span class="cx"> double delay;
</span><span class="cx"> String urlString;
</span><span class="cx"> if (frame && parseHTTPRefresh(content, true, delay, urlString)) {
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -230,4 +230,4 @@
</span><span class="cx"> # as a means to pass data from the web-portion of their app to the native portion.
</span><span class="cx"> allowNavigationToInvalidURL initial=false
</span><span class="cx">
</span><del>-metaRefreshEnabled initial=true
</del><ins>+httpEquivEnabled initial=true
</ins></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-07-08 Lucas Forschler <lforschler@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beidson@apple.com>
+
+ Add preference to disable all http-equiv.
+ <rdar://problem/9091261> and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences setMetaRefreshEnabled:]): Still expose this SPI, but have it affect
+ the "httpEquivEnabled" setting.
+ (-[WebPreferences metaRefreshEnabled]): Ditto.
+ (-[WebPreferences setHTTPEquivEnabled:]):
+ (-[WebPreferences httpEquivEnabled]):
+ * WebView/WebPreferencesPrivate.h:
+
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ (-[WebView _preferencesChanged:]):
+
</ins><span class="cx"> 2015-06-10 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r185436.
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> #define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
</span><span class="cx">
</span><span class="cx"> #define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
</span><del>-#define WebKitMetaRefreshEnabledPreferenceKey @"WebKitMetaRefreshEnabled"
</del><ins>+#define WebKitHTTPEquivEnabledPreferenceKey @"WebKitHTTPEquivEnabled"
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #define WebKitStandalonePreferenceKey @"WebKitStandalonePreferenceKey"
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferences.mm (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -440,7 +440,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitPluginsEnabledPreferenceKey,
</span><span class="cx"> [NSNumber numberWithBool:YES], WebKitDatabasesEnabledPreferenceKey,
</span><del>- [NSNumber numberWithBool:YES], WebKitMetaRefreshEnabledPreferenceKey,
</del><ins>+ [NSNumber numberWithBool:YES], WebKitHTTPEquivEnabledPreferenceKey,
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> [NSNumber numberWithBool:NO], WebKitStorageTrackerEnabledPreferenceKey,
</span><span class="cx"> #endif
</span><span class="lines">@@ -2535,14 +2536,24 @@
</span><span class="cx">
</span><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)enabled
</span><span class="cx"> {
</span><del>- [self _setBoolValue:enabled forKey:WebKitMetaRefreshEnabledPreferenceKey];
</del><ins>+ [self setHTTPEquivEnabled:enabled];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)metaRefreshEnabled
</span><span class="cx"> {
</span><del>- return [self _boolValueForKey:WebKitMetaRefreshEnabledPreferenceKey];
</del><ins>+ return [self metaRefreshEnabled];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setHTTPEquivEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitHTTPEquivEnabledPreferenceKey];
+}
+
+- (BOOL)httpEquivEnabled
+{
+ return [self _boolValueForKey:WebKitHTTPEquivEnabledPreferenceKey];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebInternal)
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -438,6 +438,9 @@
</span><span class="cx"> - (void)setMetaRefreshEnabled:(BOOL)flag;
</span><span class="cx"> - (BOOL)metaRefreshEnabled;
</span><span class="cx">
</span><ins>+- (void)setHTTPEquivEnabled:(BOOL)flag;
+- (BOOL)httpEquivEnabled;
+
</ins><span class="cx"> #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
</span><span class="cx"> - (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1195,7 +1195,7 @@
</span><span class="cx"> _private->page->settings().setMinimumFontSize([_private->preferences minimumFontSize]);
</span><span class="cx">
</span><span class="cx"> // This is a workaround for <rdar://problem/21309911>.
</span><del>- _private->page->settings().setMetaRefreshEnabled([_private->preferences metaRefreshEnabled]);
</del><ins>+ _private->page->settings().setHttpEquivEnabled([_private->preferences httpEquivEnabled]);
</ins><span class="cx">
</span><span class="cx"> [self setGroupName:groupName];
</span><span class="cx">
</span><span class="lines">@@ -2298,7 +2298,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
</span><del>- settings.setMetaRefreshEnabled([preferences metaRefreshEnabled]);
</del><ins>+ settings.setHttpEquivEnabled([preferences httpEquivEnabled]);
</ins><span class="cx">
</span><span class="cx"> settings.setFixedPositionCreatesStackingContext(true);
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-08 Lucas Forschler <lforschler@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beidson@apple.com>
+
+ Add preference to disable all http-equiv.
+ <rdar://problem/9091261> and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebPreferencesDefinitions.h:
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetMetaRefreshEnabled): Still expose this SPI, but have it affect
+ the "httpEquivEnabled" setting.
+ (WKPreferencesGetMetaRefreshEnabled): Ditto
+ (WKPreferencesSetHTTPEquivEnabled):
+ (WKPreferencesGetHTTPEquivEnabled):
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2015-06-08 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183682.
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
</span><span class="cx"> macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
</span><span class="cx"> macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
</span><del>- macro(MetaRefreshEnabled, metaRefreshEnabled, Bool, bool, true) \
</del><ins>+ macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -1298,10 +1298,20 @@
</span><span class="cx">
</span><span class="cx"> void WKPreferencesSetMetaRefreshEnabled(WKPreferencesRef preferencesRef, bool enabled)
</span><span class="cx"> {
</span><del>- toImpl(preferencesRef)->setMetaRefreshEnabled(enabled);
</del><ins>+ toImpl(preferencesRef)->setHTTPEquivEnabled(enabled);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKPreferencesGetMetaRefreshEnabled(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><del>- return toImpl(preferencesRef)->metaRefreshEnabled();
</del><ins>+ return toImpl(preferencesRef)->httpEquivEnabled();
</ins><span class="cx"> }
</span><ins>+
+void WKPreferencesSetHTTPEquivEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setHTTPEquivEnabled(enabled);
+}
+
+bool WKPreferencesGetHTTPEquivEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->httpEquivEnabled();
+}
</ins></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -342,6 +342,10 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetMetaRefreshEnabled(WKPreferencesRef preferences, bool enabled);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetMetaRefreshEnabled(WKPreferencesRef preferences);
</span><span class="cx">
</span><ins>+// Defaults to true.
+WK_EXPORT void WKPreferencesSetHTTPEquivEnabled(WKPreferencesRef preferences, bool enabled);
+WK_EXPORT bool WKPreferencesGetHTTPEquivEnabled(WKPreferencesRef preferences);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
</span><span class="cx"> macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
</span><span class="cx"> macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
</span><del>- macro(WebKitMetaRefreshEnabled, MetaRefreshEnabled, metaRefreshEnabled)
</del><ins>+ macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled)
</ins><span class="cx">
</span><span class="cx"> #define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
</span><span class="cx"> if (preference == #TestRunnerName) { \
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186538 => 186539)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-08 23:46:16 UTC (rev 186538)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-08 23:50:02 UTC (rev 186539)
</span><span class="lines">@@ -2749,7 +2749,7 @@
</span><span class="cx"> settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
</span><span class="cx"> settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
</span><span class="cx">
</span><del>- settings.setMetaRefreshEnabled(store.getBoolValueForKey(WebPreferencesKey::metaRefreshEnabledKey()));
</del><ins>+ settings.setHttpEquivEnabled(store.getBoolValueForKey(WebPreferencesKey::httpEquivEnabledKey()));
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="cx"> DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
</span></span></pre>
</div>
</div>
</body>
</html>