Diff
Modified: trunk/Source/WebCore/ChangeLog (251193 => 251194)
--- trunk/Source/WebCore/ChangeLog 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/ChangeLog 2019-10-16 18:24:25 UTC (rev 251194)
@@ -1,3 +1,41 @@
+2019-10-16 Chris Dumez <cdu...@apple.com>
+
+ Drop unused WKPageSetResourceCachingDisabled() SPI
+ https://bugs.webkit.org/show_bug.cgi?id=203035
+
+ Reviewed by Alex Christensen.
+
+ * history/PageCache.cpp:
+ (WebCore::canCachePage):
+ (WebCore::PageCache::take):
+ (WebCore::PageCache::get):
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerShouldUsePersistentCache const):
+ * inspector/agents/page/PageNetworkAgent.cpp:
+ (WebCore::PageNetworkAgent::setResourceCachingDisabled):
+ * inspector/agents/worker/WorkerNetworkAgent.cpp:
+ (WebCore::WorkerNetworkAgent::setResourceCachingDisabled):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::subresourceCachePolicy const):
+ (WebCore::FrameLoader::addExtraFieldsToRequest):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::cachePolicy const):
+ * page/Page.h:
+ (WebCore::Page::isResourceCachingDisabledByWebInspector const):
+ (WebCore::Page::setResourceCachingDisabledByWebInspector):
+ (WebCore::Page::isResourceCachingDisabled const): Deleted.
+ (WebCore::Page::setResourceCachingDisabled): Deleted.
+ (WebCore::Page::setResourceCachingDisabledOverride): Deleted.
+ * workers/WorkerDebuggerProxy.h:
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::setResourceCachingDisabledByWebInspector):
+ (WebCore::WorkerMessagingProxy::setResourceCachingDisabled): Deleted.
+ * workers/WorkerMessagingProxy.h:
+ * workers/service/context/ServiceWorkerThreadProxy.cpp:
+ (WebCore::ServiceWorkerThreadProxy::setResourceCachingDisabledByWebInspector):
+ (WebCore::ServiceWorkerThreadProxy::setResourceCachingDisabled): Deleted.
+ * workers/service/context/ServiceWorkerThreadProxy.h:
+
2019-10-16 Fujii Hironori <hironori.fu...@sony.com>
DumpRenderTree should clear WTFLogChannelState::OnWithAccumulation state set by testRunner.accummulateLogsForChannel
Modified: trunk/Source/WebCore/history/PageCache.cpp (251193 => 251194)
--- trunk/Source/WebCore/history/PageCache.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/history/PageCache.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -194,7 +194,7 @@
DiagnosticLoggingClient& diagnosticLoggingClient = page.diagnosticLoggingClient();
bool isCacheable = canCacheFrame(page.mainFrame(), diagnosticLoggingClient, indentLevel + 1);
- if (!page.settings().usesPageCache() || page.isResourceCachingDisabled()) {
+ if (!page.settings().usesPageCache() || page.isResourceCachingDisabledByWebInspector()) {
PCLOG(" -Page settings says b/f cache disabled");
logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::isDisabledKey());
isCacheable = false;
@@ -484,7 +484,7 @@
RELEASE_LOG(BackForwardCache, "PageCache::take item: %s, size: %u / %u", item.identifier().string().utf8().data(), pageCount(), maxSize());
- if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
+ if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabledByWebInspector())) {
LOG(BackForwardCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
return nullptr;
@@ -521,7 +521,7 @@
return nullptr;
}
- if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
+ if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabledByWebInspector())) {
LOG(BackForwardCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
remove(item);
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (251193 => 251194)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -7104,7 +7104,7 @@
bool HTMLMediaElement::mediaPlayerShouldUsePersistentCache() const
{
if (Page* page = document().page())
- return !page->usesEphemeralSession() && !page->isResourceCachingDisabled();
+ return !page->usesEphemeralSession() && !page->isResourceCachingDisabledByWebInspector();
return false;
}
Modified: trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp (251193 => 251194)
--- trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -97,7 +97,7 @@
void PageNetworkAgent::setResourceCachingDisabled(bool disabled)
{
- m_inspectedPage.setResourceCachingDisabledOverride(disabled);
+ m_inspectedPage.setResourceCachingDisabledByWebInspector(disabled);
}
ScriptExecutionContext* PageNetworkAgent::scriptExecutionContext(ErrorString& errorString, const String& frameId)
Modified: trunk/Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp (251193 => 251194)
--- trunk/Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -61,7 +61,7 @@
void WorkerNetworkAgent::setResourceCachingDisabled(bool disabled)
{
- m_workerGlobalScope.thread().workerDebuggerProxy().setResourceCachingDisabled(disabled);
+ m_workerGlobalScope.thread().workerDebuggerProxy().setResourceCachingDisabledByWebInspector(disabled);
}
ScriptExecutionContext* WorkerNetworkAgent::scriptExecutionContext(ErrorString&, const String&)
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (251193 => 251194)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -2414,7 +2414,7 @@
CachePolicy FrameLoader::subresourceCachePolicy(const URL& url) const
{
if (Page* page = m_frame.page()) {
- if (page->isResourceCachingDisabled())
+ if (page->isResourceCachingDisabledByWebInspector())
return CachePolicyReload;
}
@@ -2955,7 +2955,7 @@
Page* page = frame().page();
bool hasSpecificCachePolicy = request.cachePolicy() != ResourceRequestCachePolicy::UseProtocolCachePolicy;
- if (page && page->isResourceCachingDisabled()) {
+ if (page && page->isResourceCachingDisabledByWebInspector()) {
request.setCachePolicy(ResourceRequestCachePolicy::ReloadIgnoringCacheData);
loadType = FrameLoadType::ReloadFromOrigin;
} else if (!hasSpecificCachePolicy)
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (251193 => 251194)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -1350,7 +1350,7 @@
return frame->loader().subresourceCachePolicy(url);
if (Page* page = frame->page()) {
- if (page->isResourceCachingDisabled())
+ if (page->isResourceCachingDisabledByWebInspector())
return CachePolicyReload;
}
Modified: trunk/Source/WebCore/page/Page.h (251193 => 251194)
--- trunk/Source/WebCore/page/Page.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/page/Page.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -679,12 +679,9 @@
String captionUserPreferencesStyleSheet();
void setCaptionUserPreferencesStyleSheet(const String&);
- bool isResourceCachingDisabled() const { return m_resourceCachingDisabled || m_resourceCachingDisabledOverride; }
- void setResourceCachingDisabled(bool disabled) { m_resourceCachingDisabled = disabled; }
+ bool isResourceCachingDisabledByWebInspector() const { return m_resourceCachingDisabledByWebInspector; }
+ void setResourceCachingDisabledByWebInspector(bool disabled) { m_resourceCachingDisabledByWebInspector = disabled; }
- // Web Inspector can override whatever value is set via WebKit SPI, but only while it is open.
- void setResourceCachingDisabledOverride(bool disabled) { m_resourceCachingDisabledOverride = disabled; }
-
Optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const { return m_eventThrottlingBehaviorOverride; }
void setEventThrottlingBehaviorOverride(Optional<EventThrottlingBehavior> throttling) { m_eventThrottlingBehaviorOverride = throttling; }
@@ -949,8 +946,7 @@
bool m_allowsPlaybackControlsForAutoplayingAudio { false };
bool m_showAllPlugins { false };
bool m_controlledByAutomation { false };
- bool m_resourceCachingDisabled { false };
- bool m_resourceCachingDisabledOverride { false };
+ bool m_resourceCachingDisabledByWebInspector { false };
bool m_isUtilityPage;
UserInterfaceLayoutDirection m_userInterfaceLayoutDirection { UserInterfaceLayoutDirection::LTR };
Modified: trunk/Source/WebCore/workers/WorkerDebuggerProxy.h (251193 => 251194)
--- trunk/Source/WebCore/workers/WorkerDebuggerProxy.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/workers/WorkerDebuggerProxy.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -36,7 +36,7 @@
public:
virtual ~WorkerDebuggerProxy() = default;
virtual void postMessageToDebugger(const String&) = 0;
- virtual void setResourceCachingDisabled(bool) = 0;
+ virtual void setResourceCachingDisabledByWebInspector(bool) = 0;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (251193 => 251194)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -173,12 +173,12 @@
});
}
-void WorkerMessagingProxy::setResourceCachingDisabled(bool disabled)
+void WorkerMessagingProxy::setResourceCachingDisabledByWebInspector(bool disabled)
{
postTaskToLoader([disabled] (ScriptExecutionContext& context) {
ASSERT(isMainThread());
if (auto* page = downcast<Document>(context).page())
- page->setResourceCachingDisabled(disabled);
+ page->setResourceCachingDisabledByWebInspector(disabled);
});
}
Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.h (251193 => 251194)
--- trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -69,7 +69,7 @@
// Implementation of WorkerDebuggerProxy.
// (Only use these functions in the worker context thread.)
void postMessageToDebugger(const String&) final;
- void setResourceCachingDisabled(bool) final;
+ void setResourceCachingDisabledByWebInspector(bool) final;
// Implementation of WorkerLoaderProxy.
// These functions are called on different threads to schedule loading
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp (251193 => 251194)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -147,11 +147,11 @@
});
}
-void ServiceWorkerThreadProxy::setResourceCachingDisabled(bool disabled)
+void ServiceWorkerThreadProxy::setResourceCachingDisabledByWebInspector(bool disabled)
{
postTaskToLoader([this, protectedThis = makeRef(*this), disabled] (ScriptExecutionContext&) {
ASSERT(isMainThread());
- m_page->setResourceCachingDisabled(disabled);
+ m_page->setResourceCachingDisabledByWebInspector(disabled);
});
}
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h (251193 => 251194)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerThreadProxy.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -88,7 +88,7 @@
// WorkerDebuggerProxy
void postMessageToDebugger(const String&) final;
- void setResourceCachingDisabled(bool) final;
+ void setResourceCachingDisabledByWebInspector(bool) final;
UniqueRef<Page> m_page;
Ref<Document> m_document;
Modified: trunk/Source/WebKit/ChangeLog (251193 => 251194)
--- trunk/Source/WebKit/ChangeLog 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/ChangeLog 2019-10-16 18:24:25 UTC (rev 251194)
@@ -1,3 +1,23 @@
+2019-10-16 Chris Dumez <cdu...@apple.com>
+
+ Drop unused WKPageSetResourceCachingDisabled() SPI
+ https://bugs.webkit.org/show_bug.cgi?id=203035
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetResourceCachingDisabled): Deleted.
+ (WKPageSetResourceCachingDisabled): Deleted.
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setResourceCachingDisabled): Deleted.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::isResourceCachingDisabled const): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setResourceCachingDisabled): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2019-10-16 Wenson Hsieh <wenson_hs...@apple.com>
Unreviewed, fix the internal macOS 10.13 and 10.14 builds after r251171
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp (251193 => 251194)
--- trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -2870,16 +2870,6 @@
});
}
-bool WKPageGetResourceCachingDisabled(WKPageRef page)
-{
- return toImpl(page)->isResourceCachingDisabled();
-}
-
-void WKPageSetResourceCachingDisabled(WKPageRef page, bool disabled)
-{
- toImpl(page)->setResourceCachingDisabled(disabled);
-}
-
void WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportScaleLimits)
{
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h (251193 => 251194)
--- trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPagePrivate.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -169,9 +169,6 @@
typedef void (*WKPagePostPresentationUpdateFunction)(WKErrorRef, void*);
WK_EXPORT void WKPageCallAfterNextPresentationUpdate(WKPageRef page, void* context, WKPagePostPresentationUpdateFunction function);
-WK_EXPORT bool WKPageGetResourceCachingDisabled(WKPageRef page);
-WK_EXPORT void WKPageSetResourceCachingDisabled(WKPageRef page, bool disabled);
-
WK_EXPORT void WKPageRestoreFromSessionStateWithoutNavigation(WKPageRef page, WKTypeRef sessionState);
WK_EXPORT void WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportScaleLimits);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (251193 => 251194)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -8685,19 +8685,6 @@
dataCallback(data, callbackID);
}
-void WebPageProxy::setResourceCachingDisabled(bool disabled)
-{
- if (m_isResourceCachingDisabled == disabled)
- return;
-
- m_isResourceCachingDisabled = disabled;
-
- if (!hasRunningProcess())
- return;
-
- m_process->send(Messages::WebPage::SetResourceCachingDisabled(disabled), m_webPageID);
-}
-
WebCore::UserInterfaceLayoutDirection WebPageProxy::userInterfaceLayoutDirection()
{
return pageClient().userInterfaceLayoutDirection();
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (251193 => 251194)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -1430,9 +1430,6 @@
void getWindowFrame(Messages::WebPageProxy::GetWindowFrame::DelayedReply&&);
void getWindowFrameWithCallback(Function<void(WebCore::FloatRect)>&&);
- bool isResourceCachingDisabled() const { return m_isResourceCachingDisabled; }
- void setResourceCachingDisabled(bool);
-
WebCore::UserInterfaceLayoutDirection userInterfaceLayoutDirection();
void setUserInterfaceLayoutDirection(WebCore::UserInterfaceLayoutDirection);
@@ -2499,8 +2496,6 @@
WebCore::MediaProducer::MediaStateFlags m_mediaState { WebCore::MediaProducer::IsNotPlaying };
- bool m_isResourceCachingDisabled { false };
-
bool m_hasHadSelectionChangesFromUserInteraction { false };
bool m_isTouchBarUpdateSupressedForHiddenContentEditable { false };
bool m_isNeverRichlyEditableForTouchBar { false };
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (251193 => 251194)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-10-16 18:24:25 UTC (rev 251194)
@@ -6385,11 +6385,6 @@
send(Messages::WebPageProxy::DidRestoreScrollPosition());
}
-void WebPage::setResourceCachingDisabled(bool disabled)
-{
- m_page->setResourceCachingDisabled(disabled);
-}
-
void WebPage::setUserInterfaceLayoutDirection(uint32_t direction)
{
m_userInterfaceLayoutDirection = static_cast<WebCore::UserInterfaceLayoutDirection>(direction);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (251193 => 251194)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2019-10-16 18:24:25 UTC (rev 251194)
@@ -1580,7 +1580,6 @@
void didEndRequestInstallMissingMediaPlugins(uint32_t result);
#endif
- void setResourceCachingDisabled(bool);
void setUserInterfaceLayoutDirection(uint32_t);
bool canPluginHandleResponse(const WebCore::ResourceResponse&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (251193 => 251194)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-10-16 18:15:01 UTC (rev 251193)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2019-10-16 18:24:25 UTC (rev 251194)
@@ -523,8 +523,6 @@
DidEndRequestInstallMissingMediaPlugins(uint32_t result)
#endif
- SetResourceCachingDisabled(bool disabled)
-
SetUserInterfaceLayoutDirection(uint32_t direction)
DidGetLoadDecisionForIcon(bool decision, WebKit::CallbackID loadIdentifier, WebKit::OptionalCallbackID newCallbackID)
