Changeset 215730 in webkit

Timestamp:

Apr 25, 2017 7:14:00 AM (7 years ago)

Author:

Antti Koivisto

Message:

Enable expired-only reload policy on Mac and iOS
​https://bugs.webkit.org/show_bug.cgi?id=171264
<rdar://problem/31807637>

Reviewed by Andreas Kling.

Source/WebCore:

• loader/NavigationAction.cpp:

(WebCore::navigationType):

Test for reload navigation type correctly.

Source/WebKit2:

Enable the reload policy where only expired subresources are revalidated on Mac and iOS.
The behavor is enabled in Safari and for other clients based on SDK version check.

• UIProcess/API/C/WKPage.cpp:

(WKPageReload):

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView reload]):

• UIProcess/Cocoa/VersionChecks.h:

LayoutTests:

• fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html:

WebKitDisplayImages preference blocks loads, it does not prevent images already in memory cache from displaying.
Modify the test to clear the memory cache so it still tests what it is supposed to.

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  Antti Koivisto  <antti@apple.com>
+
+        Enable expired-only reload policy on Mac and iOS
+        https://bugs.webkit.org/show_bug.cgi?id=171264
+        <rdar://problem/31807637>
+
+        Reviewed by Andreas Kling.
+
+        * fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html:
+
+        WebKitDisplayImages preference blocks loads, it does not prevent images already in memory cache from displaying.
+        Modify the test to clear the memory cache so it still tests what it is supposed to.
+
 2017-04-25  Frederic Wang  <fwang@igalia.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  Antti Koivisto  <antti@apple.com>
+
+        Enable expired-only reload policy on Mac and iOS
+        https://bugs.webkit.org/show_bug.cgi?id=171264
+        <rdar://problem/31807637>
+
+        Reviewed by Andreas Kling.
+
+        * loader/NavigationAction.cpp:
+        (WebCore::navigationType):
+
+        Test for reload navigation type correctly.
+
 2017-04-25  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/loader/NavigationAction.cpp

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-04-25  Antti Koivisto  <antti@apple.com>
+
+        Enable expired-only reload policy on Mac and iOS
+        https://bugs.webkit.org/show_bug.cgi?id=171264
+        <rdar://problem/31807637>
+
+        Reviewed by Andreas Kling.
+
+        Enable the reload policy where only expired subresources are revalidated on Mac and iOS.
+        The behavor is enabled in Safari and for other clients based on SDK version check.
+
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageReload):
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView reload]):
+        * UIProcess/Cocoa/VersionChecks.h:
+
 2017-04-25  Wenson Hsieh  <wenson_hsieh@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;
@@ -243 +247 @@
 void WKPageReload(WKPageRef pageRef)
 {
-    toImpl(pageRef)->reload({ });
+    OptionSet<WebCore::ReloadOption> reloadOptions;
+#if PLATFORM(COCOA)
+    if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
+        reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
+#endif
+
+    toImpl(pageRef)->reload(reloadOptions);
 }
 

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

@@ -843 +843 @@
 - (WKNavigation *)reload
 {
-    auto navigation = _page->reload({ });
+    OptionSet<WebCore::ReloadOption> reloadOptions;
+    if (linkedOnOrAfter(WebKit::SDKVersion::FirstWithExpiredOnlyReloadBehavior))
+        reloadOptions |= WebCore::ReloadOption::ExpiredOnly;
+
+    auto navigation = _page->reload(reloadOptions);
     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
+    FirstWithDropToNavigateDisallowedByDefault = DYLD_MACOSX_VERSION_10_13,
+    FirstWithExpiredOnlyReloadBehavior = DYLD_MACOSX_VERSION_10_13,
 #endif
 };