Skip to content

Commit 2eb59bb

Browse files
cdumezcdumez
committed
Drop unused WKPageSetResourceCachingDisabled() SPI
https://bugs.webkit.org/show_bug.cgi?id=203035 Reviewed by Alex Christensen. Source/WebCore: * 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: Source/WebKit: * 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: Canonical link: https://commits.webkit.org/216470@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@251194 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 25a012b commit 2eb59bb

21 files changed

Lines changed: 77 additions & 62 deletions

‎Source/WebCore/ChangeLog‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
2019-10-16 Chris Dumez <[email protected]>
2+
3+
Drop unused WKPageSetResourceCachingDisabled() SPI
4+
https://bugs.webkit.org/show_bug.cgi?id=203035
5+
6+
Reviewed by Alex Christensen.
7+
8+
* history/PageCache.cpp:
9+
(WebCore::canCachePage):
10+
(WebCore::PageCache::take):
11+
(WebCore::PageCache::get):
12+
* html/HTMLMediaElement.cpp:
13+
(WebCore::HTMLMediaElement::mediaPlayerShouldUsePersistentCache const):
14+
* inspector/agents/page/PageNetworkAgent.cpp:
15+
(WebCore::PageNetworkAgent::setResourceCachingDisabled):
16+
* inspector/agents/worker/WorkerNetworkAgent.cpp:
17+
(WebCore::WorkerNetworkAgent::setResourceCachingDisabled):
18+
* loader/FrameLoader.cpp:
19+
(WebCore::FrameLoader::subresourceCachePolicy const):
20+
(WebCore::FrameLoader::addExtraFieldsToRequest):
21+
* loader/cache/CachedResourceLoader.cpp:
22+
(WebCore::CachedResourceLoader::cachePolicy const):
23+
* page/Page.h:
24+
(WebCore::Page::isResourceCachingDisabledByWebInspector const):
25+
(WebCore::Page::setResourceCachingDisabledByWebInspector):
26+
(WebCore::Page::isResourceCachingDisabled const): Deleted.
27+
(WebCore::Page::setResourceCachingDisabled): Deleted.
28+
(WebCore::Page::setResourceCachingDisabledOverride): Deleted.
29+
* workers/WorkerDebuggerProxy.h:
30+
* workers/WorkerMessagingProxy.cpp:
31+
(WebCore::WorkerMessagingProxy::setResourceCachingDisabledByWebInspector):
32+
(WebCore::WorkerMessagingProxy::setResourceCachingDisabled): Deleted.
33+
* workers/WorkerMessagingProxy.h:
34+
* workers/service/context/ServiceWorkerThreadProxy.cpp:
35+
(WebCore::ServiceWorkerThreadProxy::setResourceCachingDisabledByWebInspector):
36+
(WebCore::ServiceWorkerThreadProxy::setResourceCachingDisabled): Deleted.
37+
* workers/service/context/ServiceWorkerThreadProxy.h:
38+
139
2019-10-16 Fujii Hironori <[email protected]>
240

341
DumpRenderTree should clear WTFLogChannelState::OnWithAccumulation state set by testRunner.accummulateLogsForChannel

‎Source/WebCore/history/PageCache.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static bool canCachePage(Page& page)
194194
DiagnosticLoggingClient& diagnosticLoggingClient = page.diagnosticLoggingClient();
195195
bool isCacheable = canCacheFrame(page.mainFrame(), diagnosticLoggingClient, indentLevel + 1);
196196

197-
if (!page.settings().usesPageCache() || page.isResourceCachingDisabled()) {
197+
if (!page.settings().usesPageCache() || page.isResourceCachingDisabledByWebInspector()) {
198198
PCLOG(" -Page settings says b/f cache disabled");
199199
logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::isDisabledKey());
200200
isCacheable = false;
@@ -484,7 +484,7 @@ std::unique_ptr<CachedPage> PageCache::take(HistoryItem& item, Page* page)
484484

485485
RELEASE_LOG(BackForwardCache, "PageCache::take item: %s, size: %u / %u", item.identifier().string().utf8().data(), pageCount(), maxSize());
486486

487-
if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
487+
if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabledByWebInspector())) {
488488
LOG(BackForwardCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
489489
logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
490490
return nullptr;
@@ -521,7 +521,7 @@ CachedPage* PageCache::get(HistoryItem& item, Page* page)
521521
return nullptr;
522522
}
523523

524-
if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
524+
if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabledByWebInspector())) {
525525
LOG(BackForwardCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
526526
logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
527527
remove(item);

‎Source/WebCore/html/HTMLMediaElement.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7104,7 +7104,7 @@ const MediaResourceLoader* HTMLMediaElement::lastMediaResourceLoaderForTesting()
71047104
bool HTMLMediaElement::mediaPlayerShouldUsePersistentCache() const
71057105
{
71067106
if (Page* page = document().page())
7107-
return !page->usesEphemeralSession() && !page->isResourceCachingDisabled();
7107+
return !page->usesEphemeralSession() && !page->isResourceCachingDisabledByWebInspector();
71087108

71097109
return false;
71107110
}

‎Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Vector<WebSocket*> PageNetworkAgent::activeWebSockets(const LockHolder& lock)
9797

9898
void PageNetworkAgent::setResourceCachingDisabled(bool disabled)
9999
{
100-
m_inspectedPage.setResourceCachingDisabledOverride(disabled);
100+
m_inspectedPage.setResourceCachingDisabledByWebInspector(disabled);
101101
}
102102

103103
ScriptExecutionContext* PageNetworkAgent::scriptExecutionContext(ErrorString& errorString, const String& frameId)

‎Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Vector<WebSocket*> WorkerNetworkAgent::activeWebSockets(const LockHolder&)
6161

6262
void WorkerNetworkAgent::setResourceCachingDisabled(bool disabled)
6363
{
64-
m_workerGlobalScope.thread().workerDebuggerProxy().setResourceCachingDisabled(disabled);
64+
m_workerGlobalScope.thread().workerDebuggerProxy().setResourceCachingDisabledByWebInspector(disabled);
6565
}
6666

6767
ScriptExecutionContext* WorkerNetworkAgent::scriptExecutionContext(ErrorString&, const String&)

‎Source/WebCore/loader/FrameLoader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2414,7 +2414,7 @@ FrameLoadType FrameLoader::loadType() const
24142414
CachePolicy FrameLoader::subresourceCachePolicy(const URL& url) const
24152415
{
24162416
if (Page* page = m_frame.page()) {
2417-
if (page->isResourceCachingDisabled())
2417+
if (page->isResourceCachingDisabledByWebInspector())
24182418
return CachePolicyReload;
24192419
}
24202420

@@ -2955,7 +2955,7 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp
29552955
Page* page = frame().page();
29562956
bool hasSpecificCachePolicy = request.cachePolicy() != ResourceRequestCachePolicy::UseProtocolCachePolicy;
29572957

2958-
if (page && page->isResourceCachingDisabled()) {
2958+
if (page && page->isResourceCachingDisabledByWebInspector()) {
29592959
request.setCachePolicy(ResourceRequestCachePolicy::ReloadIgnoringCacheData);
29602960
loadType = FrameLoadType::ReloadFromOrigin;
29612961
} else if (!hasSpecificCachePolicy)

‎Source/WebCore/loader/cache/CachedResourceLoader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ CachePolicy CachedResourceLoader::cachePolicy(CachedResource::Type type, const U
13501350
return frame->loader().subresourceCachePolicy(url);
13511351

13521352
if (Page* page = frame->page()) {
1353-
if (page->isResourceCachingDisabled())
1353+
if (page->isResourceCachingDisabledByWebInspector())
13541354
return CachePolicyReload;
13551355
}
13561356

‎Source/WebCore/page/Page.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -679,11 +679,8 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
679679
String captionUserPreferencesStyleSheet();
680680
void setCaptionUserPreferencesStyleSheet(const String&);
681681

682-
bool isResourceCachingDisabled() const { return m_resourceCachingDisabled || m_resourceCachingDisabledOverride; }
683-
void setResourceCachingDisabled(bool disabled) { m_resourceCachingDisabled = disabled; }
684-
685-
// Web Inspector can override whatever value is set via WebKit SPI, but only while it is open.
686-
void setResourceCachingDisabledOverride(bool disabled) { m_resourceCachingDisabledOverride = disabled; }
682+
bool isResourceCachingDisabledByWebInspector() const { return m_resourceCachingDisabledByWebInspector; }
683+
void setResourceCachingDisabledByWebInspector(bool disabled) { m_resourceCachingDisabledByWebInspector = disabled; }
687684

688685
Optional<EventThrottlingBehavior> eventThrottlingBehaviorOverride() const { return m_eventThrottlingBehaviorOverride; }
689686
void setEventThrottlingBehaviorOverride(Optional<EventThrottlingBehavior> throttling) { m_eventThrottlingBehaviorOverride = throttling; }
@@ -949,8 +946,7 @@ class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
949946
bool m_allowsPlaybackControlsForAutoplayingAudio { false };
950947
bool m_showAllPlugins { false };
951948
bool m_controlledByAutomation { false };
952-
bool m_resourceCachingDisabled { false };
953-
bool m_resourceCachingDisabledOverride { false };
949+
bool m_resourceCachingDisabledByWebInspector { false };
954950
bool m_isUtilityPage;
955951
UserInterfaceLayoutDirection m_userInterfaceLayoutDirection { UserInterfaceLayoutDirection::LTR };
956952

‎Source/WebCore/workers/WorkerDebuggerProxy.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class WorkerDebuggerProxy {
3636
public:
3737
virtual ~WorkerDebuggerProxy() = default;
3838
virtual void postMessageToDebugger(const String&) = 0;
39-
virtual void setResourceCachingDisabled(bool) = 0;
39+
virtual void setResourceCachingDisabledByWebInspector(bool) = 0;
4040
};
4141

4242
} // namespace WebCore

‎Source/WebCore/workers/WorkerMessagingProxy.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,12 @@ void WorkerMessagingProxy::postMessageToDebugger(const String& message)
173173
});
174174
}
175175

176-
void WorkerMessagingProxy::setResourceCachingDisabled(bool disabled)
176+
void WorkerMessagingProxy::setResourceCachingDisabledByWebInspector(bool disabled)
177177
{
178178
postTaskToLoader([disabled] (ScriptExecutionContext& context) {
179179
ASSERT(isMainThread());
180180
if (auto* page = downcast<Document>(context).page())
181-
page->setResourceCachingDisabled(disabled);
181+
page->setResourceCachingDisabledByWebInspector(disabled);
182182
});
183183
}
184184

0 commit comments

Comments
 (0)