Diff
Modified: trunk/LayoutTests/ChangeLog (215771 => 215772)
--- trunk/LayoutTests/ChangeLog 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/LayoutTests/ChangeLog 2017-04-26 00:07:13 UTC (rev 215772)
@@ -1,3 +1,16 @@
+2017-04-25 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215730.
+
+ The LayoutTest for this change is a flaky timeout on mac-wk1
+ debug.
+
+ Reverted changeset:
+
+ "Enable expired-only reload policy on Mac and iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=171264
+ http://trac.webkit.org/changeset/215730
+
2017-04-25 Said Abou-Hallawa <sabouhall...@apple.com>
Restrict WebKit image formats to a known whitelist
Modified: trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html (215771 => 215772)
--- trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html 2017-04-26 00:07:13 UTC (rev 215772)
@@ -10,7 +10,6 @@
testRunner.dumpAsText();
window.internals.settings.setImagesEnabled(true);
testRunner.overridePreference('WebKitDisplayImagesKey', 0);
- window.internals.clearMemoryCache();
testRunner.queueReload();
}
Modified: trunk/Source/WebCore/ChangeLog (215771 => 215772)
--- trunk/Source/WebCore/ChangeLog 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebCore/ChangeLog 2017-04-26 00:07:13 UTC (rev 215772)
@@ -1,3 +1,16 @@
+2017-04-25 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215730.
+
+ The LayoutTest for this change is a flaky timeout on mac-wk1
+ debug.
+
+ Reverted changeset:
+
+ "Enable expired-only reload policy on Mac and iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=171264
+ http://trac.webkit.org/changeset/215730
+
2017-04-24 Matt Rajca <mra...@apple.com>
Indicate presence of audio when handling autoplay events.
Modified: trunk/Source/WebCore/loader/NavigationAction.cpp (215771 => 215772)
--- trunk/Source/WebCore/loader/NavigationAction.cpp 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebCore/loader/NavigationAction.cpp 2017-04-26 00:07:13 UTC (rev 215772)
@@ -41,7 +41,7 @@
return NavigationType::FormSubmitted;
if (haveEvent)
return NavigationType::LinkClicked;
- if (isReload(frameLoadType))
+ if (frameLoadType == FrameLoadType::Reload || frameLoadType == FrameLoadType::ReloadFromOrigin)
return NavigationType::Reload;
if (isBackForwardLoadType(frameLoadType))
return NavigationType::BackForward;
Modified: trunk/Source/WebKit2/ChangeLog (215771 => 215772)
--- trunk/Source/WebKit2/ChangeLog 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-26 00:07:13 UTC (rev 215772)
@@ -1,3 +1,16 @@
+2017-04-25 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r215730.
+
+ The LayoutTest for this change is a flaky timeout on mac-wk1
+ debug.
+
+ Reverted changeset:
+
+ "Enable expired-only reload policy on Mac and iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=171264
+ http://trac.webkit.org/changeset/215730
+
2017-04-24 Matt Rajca <mra...@apple.com>
Indicate presence of audio when handling autoplay events.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (215771 => 215772)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-26 00:07:13 UTC (rev 215772)
@@ -93,10 +93,6 @@
#include <WebCore/MediaSessionEvents.h>
#endif
-#if PLATFORM(COCOA)
-#include "VersionChecks.h"
-#endif
-
using namespace WebCore;
using namespace WebKit;
@@ -246,13 +242,7 @@
void WKPageReload(WKPageRef pageRef)
{
- OptionSet<WebCore::ReloadOption> reloadOptions;
-#if PLATFORM(COCOA)
- if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
- reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
-#endif
-
- toImpl(pageRef)->reload(reloadOptions);
+ toImpl(pageRef)->reload({ });
}
void WKPageReloadWithoutContentBlockers(WKPageRef pageRef)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (215771 => 215772)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-04-26 00:07:13 UTC (rev 215772)
@@ -842,11 +842,7 @@
- (WKNavigation *)reload
{
- OptionSet<WebCore::ReloadOption> reloadOptions;
- if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
- reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
-
- auto navigation = _page->reload(reloadOptions);
+ auto navigation = _page->reload({ });
if (!navigation)
return nil;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h (215771 => 215772)
--- trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-04-26 00:02:59 UTC (rev 215771)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h 2017-04-26 00:07:13 UTC (rev 215772)
@@ -36,12 +36,10 @@
FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_IOS_VERSION_11_0,
FirstToExcludeLocalStorageFromBackup = DYLD_IOS_VERSION_11_0,
FirstToUseSelectionGranularityCharacterByDefault = DYLD_IOS_VERSION_11_0,
- FirstWithExpiredOnlyReloadBehavior = DYLD_IOS_VERSION_11_0,
#elif PLATFORM(MAC)
FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,
FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_13,
- FirstWithDropToNavigateDisallowedByDefault = DYLD_MACOSX_VERSION_10_13,
- FirstWithExpiredOnlyReloadBehavior = DYLD_MACOSX_VERSION_10_13,
+ FirstWithDropToNavigateDisallowedByDefault = DYLD_MACOSX_VERSION_10_13
#endif
};
