Changeset 215772 in webkit

Timestamp:

Apr 25, 2017 5:07:13 PM (7 years ago)

Author:

Ryan Haddad

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/NavigationAction.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKPage.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• Source/WebKit2/UIProcess/Cocoa/VersionChecks.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html

@@ -11 +11 @@
     window.internals.settings.setImagesEnabled(true);
     testRunner.overridePreference('WebKitDisplayImagesKey', 0);
-    window.internals.clearMemoryCache();
     testRunner.queueReload();
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/loader/NavigationAction.cpp

@@ -42 +42 @@
     if (haveEvent)
         return NavigationType::LinkClicked;
-    if (isReload(frameLoadType))
+    if (frameLoadType == FrameLoadType::Reload || frameLoadType == FrameLoadType::ReloadFromOrigin)
         return NavigationType::Reload;
     if (isBackForwardLoadType(frameLoadType))

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -94 +94 @@
 #endif
 
-#if PLATFORM(COCOA)
-#include "VersionChecks.h"
-#endif
-
 using namespace WebCore;
 using namespace WebKit;
@@ -247 +243 @@
 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({ });
 }
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -843 +843 @@
 - (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;

trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h

@@ -37 +37 @@
     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
 };