Unreviewed, rolling out r215730.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Apr 2017 00:07:13 +0000 (00:07 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 26 Apr 2017 00:07:13 +0000 (00:07 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215772 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html
Source/WebCore/ChangeLog
Source/WebCore/loader/NavigationAction.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/C/WKPage.cpp
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/Cocoa/VersionChecks.h

index 9ab6361..9e9ce59 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-25  Ryan Haddad  <ryanhaddad@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  <sabouhallawa@apple.com>
 
         Restrict WebKit image formats to a known whitelist
index 03b8b8a..312f509 100644 (file)
@@ -10,7 +10,6 @@ if (window.testRunner) {
     testRunner.dumpAsText();
     window.internals.settings.setImagesEnabled(true);
     testRunner.overridePreference('WebKitDisplayImagesKey', 0);
-    window.internals.clearMemoryCache();
     testRunner.queueReload();
 }
 
index da211e5..7730843 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-25  Ryan Haddad  <ryanhaddad@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  <mrajca@apple.com>
 
         Indicate presence of audio when handling autoplay events.
index 3624b42..7ea8619 100644 (file)
@@ -41,7 +41,7 @@ static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSub
         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;
index 00338cd..08101c2 100644 (file)
@@ -1,3 +1,16 @@
+2017-04-25  Ryan Haddad  <ryanhaddad@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  <mrajca@apple.com>
 
         Indicate presence of audio when handling autoplay events.
index 07b94cf..9bcb3a3 100644 (file)
 #include <WebCore/MediaSessionEvents.h>
 #endif
 
-#if PLATFORM(COCOA)
-#include "VersionChecks.h"
-#endif
-
 using namespace WebCore;
 using namespace WebKit;
 
@@ -246,13 +242,7 @@ void WKPageStopLoading(WKPageRef pageRef)
 
 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)
index 1714469..a188c53 100644 (file)
@@ -842,11 +842,7 @@ static uint32_t convertSystemLayoutDirection(NSUserInterfaceLayoutDirection dire
 
 - (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;
 
index 9c948f6..d83fdb1 100644 (file)
@@ -36,12 +36,10 @@ enum class SDKVersion : uint32_t {
     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
 };