Diff
Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186617 => 186618)
--- branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,5 +1,22 @@
2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186539. rdar://problem/21707873
+
+ 2015-07-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beid...@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:
+
+2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186521. rdar://problem/21707887
2015-07-08 Daniel Bates <daba...@apple.com>
Modified: branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html (186617 => 186618)
--- branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,7 +1,7 @@
<head>
<script>
if (window.testRunner) {
- testRunner.overridePreference("WebKitMetaRefreshEnabled", "0");
+ testRunner.overridePreference("WebKitHTTPEquivEnabled", "0");
testRunner.dumpAsText();
testRunner.waitUntilDone();
}
Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,5 +1,26 @@
2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186539. rdar://problem/21707873
+
+ 2015-07-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beid...@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-09 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186521. rdar://problem/21707887
2015-07-08 Daniel Bates <daba...@apple.com>
Modified: branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp 2015-07-09 21:02:45 UTC (rev 186618)
@@ -2811,6 +2811,9 @@
{
ASSERT(!equiv.isNull() && !content.isNull());
+ if (page() && !page()->settings().httpEquivEnabled())
+ return;
+
Frame* frame = this->frame();
HTTPHeaderName headerName;
@@ -2831,9 +2834,6 @@
break;
case HTTPHeaderName::Refresh: {
- if (page() && !page()->settings().metaRefreshEnabled())
- break;
-
double delay;
String urlString;
if (frame && parseHTTPRefresh(content, true, delay, urlString)) {
Modified: branches/safari-600.8-branch/Source/WebCore/page/Settings.in (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebCore/page/Settings.in 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebCore/page/Settings.in 2015-07-09 21:02:45 UTC (rev 186618)
@@ -232,4 +232,4 @@
serviceControlsEnabled initial=false, conditional=SERVICE_CONTROLS
appleMailPaginationQuirkEnabled initial=false
-metaRefreshEnabled initial=true
+httpEquivEnabled initial=true
Modified: branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,3 +1,33 @@
+2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r186539. rdar://problem/21707873
+
+ 2015-07-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beid...@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:]):
+
2015-06-08 Babak Shafiei <bshaf...@apple.com>
Merge r183682.
Modified: branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2015-07-09 21:02:45 UTC (rev 186618)
@@ -179,7 +179,7 @@
#define WebKitDebugFullPageZoomPreferenceKey @"WebKitDebugFullPageZoomPreferenceKey"
#define WebKitMinimumZoomFontSizePreferenceKey @"WebKitMinimumZoomFontSizePreferenceKey"
-#define WebKitMetaRefreshEnabledPreferenceKey @"WebKitMetaRefreshEnabled"
+#define WebKitHTTPEquivEnabledPreferenceKey @"WebKitHTTPEquivEnabled"
#if TARGET_OS_IPHONE
#define WebKitStandalonePreferenceKey @"WebKitStandalonePreferenceKey"
Modified: branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2015-07-09 21:02:45 UTC (rev 186618)
@@ -440,7 +440,8 @@
#endif
[NSNumber numberWithBool:YES], WebKitPluginsEnabledPreferenceKey,
[NSNumber numberWithBool:YES], WebKitDatabasesEnabledPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitMetaRefreshEnabledPreferenceKey,
+ [NSNumber numberWithBool:YES], WebKitHTTPEquivEnabledPreferenceKey,
+
#if PLATFORM(IOS)
[NSNumber numberWithBool:NO], WebKitStorageTrackerEnabledPreferenceKey,
#endif
@@ -2559,14 +2560,24 @@
- (void)setMetaRefreshEnabled:(BOOL)enabled
{
- [self _setBoolValue:enabled forKey:WebKitMetaRefreshEnabledPreferenceKey];
+ [self setHTTPEquivEnabled:enabled];
}
- (BOOL)metaRefreshEnabled
{
- return [self _boolValueForKey:WebKitMetaRefreshEnabledPreferenceKey];
+ return [self metaRefreshEnabled];
}
+- (void)setHTTPEquivEnabled:(BOOL)enabled
+{
+ [self _setBoolValue:enabled forKey:WebKitHTTPEquivEnabledPreferenceKey];
+}
+
+- (BOOL)httpEquivEnabled
+{
+ return [self _boolValueForKey:WebKitHTTPEquivEnabledPreferenceKey];
+}
+
@end
@implementation WebPreferences (WebInternal)
Modified: branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2015-07-09 21:02:45 UTC (rev 186618)
@@ -444,6 +444,9 @@
- (void)setMetaRefreshEnabled:(BOOL)flag;
- (BOOL)metaRefreshEnabled;
+- (void)setHTTPEquivEnabled:(BOOL)flag;
+- (BOOL)httpEquivEnabled;
+
#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 80000
- (void)_setAllowCompositingLayerVisualDegradation:(BOOL)flag;
#endif
Modified: branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebView.mm (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-09 21:02:45 UTC (rev 186618)
@@ -2329,7 +2329,7 @@
}
settings.setPlugInSnapshottingEnabled([preferences plugInSnapshottingEnabled]);
- settings.setMetaRefreshEnabled([preferences metaRefreshEnabled]);
+ settings.setHttpEquivEnabled([preferences httpEquivEnabled]);
settings.setFixedPositionCreatesStackingContext(true);
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100
Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,3 +1,34 @@
+2015-07-09 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r186539. rdar://problem/21707873
+
+ 2015-07-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r186232 rdar://problem/9091261
+
+ 2015-07-02 Brady Eidson <beid...@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):
+
2015-06-08 Babak Shafiei <bshaf...@apple.com>
Merge r183682.
Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2015-07-09 21:02:45 UTC (rev 186618)
@@ -210,7 +210,7 @@
macro(EnableInheritURIQueryComponent, enableInheritURIQueryComponent, Bool, bool, false) \
macro(ServiceControlsEnabled, serviceControlsEnabled, Bool, bool, false) \
macro(GamepadsEnabled, gamepadsEnabled, Bool, bool, false) \
- macro(MetaRefreshEnabled, metaRefreshEnabled, Bool, bool, true) \
+ macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2015-07-09 21:02:45 UTC (rev 186618)
@@ -1288,10 +1288,20 @@
void WKPreferencesSetMetaRefreshEnabled(WKPreferencesRef preferencesRef, bool enabled)
{
- toImpl(preferencesRef)->setMetaRefreshEnabled(enabled);
+ toImpl(preferencesRef)->setHTTPEquivEnabled(enabled);
}
bool WKPreferencesGetMetaRefreshEnabled(WKPreferencesRef preferencesRef)
{
- return toImpl(preferencesRef)->metaRefreshEnabled();
+ return toImpl(preferencesRef)->httpEquivEnabled();
}
+
+void WKPreferencesSetHTTPEquivEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ toImpl(preferencesRef)->setHTTPEquivEnabled(enabled);
+}
+
+bool WKPreferencesGetHTTPEquivEnabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->httpEquivEnabled();
+}
Modified: branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2015-07-09 21:02:45 UTC (rev 186618)
@@ -338,6 +338,10 @@
WK_EXPORT void WKPreferencesSetMetaRefreshEnabled(WKPreferencesRef preferences, bool enabled);
WK_EXPORT bool WKPreferencesGetMetaRefreshEnabled(WKPreferencesRef preferences);
+// Defaults to true.
+WK_EXPORT void WKPreferencesSetHTTPEquivEnabled(WKPreferencesRef preferences, bool enabled);
+WK_EXPORT bool WKPreferencesGetHTTPEquivEnabled(WKPreferencesRef preferences);
+
#ifdef __cplusplus
}
#endif
Modified: branches/safari-600.8-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2015-07-09 21:02:45 UTC (rev 186618)
@@ -222,7 +222,7 @@
macro(WebKitEnableCaretBrowsing, CaretBrowsingEnabled, caretBrowsingEnabled) \
macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \
macro(WebKitMediaStreamEnabled, MediaStreamEnabled, mediaStreamEnabled) \
- macro(WebKitMetaRefreshEnabled, MetaRefreshEnabled, metaRefreshEnabled)
+ macro(WebKitHTTPEquivEnabled, HttpEquivEnabled, httpEquivEnabled)
#define OVERRIDE_PREFERENCE_AND_SET_IN_EXISTING_PAGES(TestRunnerName, SettingsName, WebPreferencesName) \
if (preference == #TestRunnerName) { \
Modified: branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186617 => 186618)
--- branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-09 21:02:45 UTC (rev 186618)
@@ -2709,7 +2709,7 @@
settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
- settings.setMetaRefreshEnabled(store.getBoolValueForKey(WebPreferencesKey::metaRefreshEnabledKey()));
+ settings.setHttpEquivEnabled(store.getBoolValueForKey(WebPreferencesKey::httpEquivEnabledKey()));
#if ENABLE(SQL_DATABASE)
DatabaseManager::manager().setIsAvailable(store.getBoolValueForKey(WebPreferencesKey::databasesEnabledKey()));
