<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198476] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198476">198476</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-03-20 13:08:59 -0700 (Sun, 20 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable Caches in Safari's Develop menu does not disable caches.
https://bugs.webkit.org/show_bug.cgi?id=64483
Reviewed by Antti Koivisto.
Source/WebCore:
Moved feature from Settings to Page.
* history/PageCache.cpp:
(WebCore::canCachePage): Use function on Page instead of Settings.
(WebCore::PageCache::take): Ditto.
(WebCore::PageCache::get): Ditto.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::subresourceCachePolicy): Ditto.
(WebCore::FrameLoader::addExtraFieldsToRequest): Ditto.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::cachePolicy): Ditto.
* page/Page.h:
(WebCore::Page::isResourceCachingDisabled): Added.
(WebCore::Page::setResourceCachingDisabled): Added.
* page/Settings.in: Removed resourceCachingDisabled.
Source/WebKit/mac:
Removed unneeded WebPreferences property; we don't need this for Legacy WebKit.
* WebView/WebPreferenceKeysPrivate.h: Removed
WebKitResourceCachingDisabledPreferenceKey.
* WebView/WebPreferences.mm:
(-[WebPreferences isResourceCachingDisabled]): Deleted.
(-[WebPreferences setResourceCachingDisabled:]): Deleted.
* WebView/WebPreferencesPrivate.h: Removed resourceCachingDisabled property.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Removed code to update resourceCachingDisabled.
Source/WebKit2:
Moved functions from WKPreferences to WKPage.
* Shared/WebPreferencesDefinitions.h: Removed ResourceCachingDisabled.
* UIProcess/API/C/WKPage.cpp:
(WKPageGetResourceCachingDisabled): Added.
(WKPageSetResourceCachingDisabled): Added.
* UIProcess/API/C/WKPagePrivate.h: Added above functions.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetResourceCachingDisabled): Deleted.
(WKPreferencesGetResourceCachingDisabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h: Deleted above functions.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setResourceCachingDisabled): Added.
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::isResourceCachingDisabled): Added.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Removed code to set the setting
for resourceCachingDisabled..
(WebKit::WebPage::setResourceCachingDisabled): Added.
* WebProcess/WebPage/WebPage.h: Declared setResourceCachingDisabled.
* WebProcess/WebPage/WebPage.messages.in: Added SetResourceCachingDisabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehistoryPageCachecpp">trunk/Source/WebCore/history/PageCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesPrivateh">trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/ChangeLog 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-20 Darin Adler <darin@apple.com>
+
+ Disable Caches in Safari's Develop menu does not disable caches.
+ https://bugs.webkit.org/show_bug.cgi?id=64483
+
+ Reviewed by Antti Koivisto.
+
+ Moved feature from Settings to Page.
+
+ * history/PageCache.cpp:
+ (WebCore::canCachePage): Use function on Page instead of Settings.
+ (WebCore::PageCache::take): Ditto.
+ (WebCore::PageCache::get): Ditto.
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::subresourceCachePolicy): Ditto.
+ (WebCore::FrameLoader::addExtraFieldsToRequest): Ditto.
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::cachePolicy): Ditto.
+
+ * page/Page.h:
+ (WebCore::Page::isResourceCachingDisabled): Added.
+ (WebCore::Page::setResourceCachingDisabled): Added.
+
+ * page/Settings.in: Removed resourceCachingDisabled.
+
</ins><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Update build settings
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/history/PageCache.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> DiagnosticLoggingClient& diagnosticLoggingClient = mainFrame.diagnosticLoggingClient();
</span><span class="cx"> bool isCacheable = canCacheFrame(mainFrame, diagnosticLoggingClient, indentLevel + 1);
</span><span class="cx">
</span><del>- if (!page.settings().usesPageCache() || page.settings().resourceCachingDisabled()) {
</del><ins>+ if (!page.settings().usesPageCache() || page.isResourceCachingDisabled()) {
</ins><span class="cx"> PCLOG(" -Page settings says b/f cache disabled");
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(diagnosticLoggingClient, DiagnosticLoggingKeys::isDisabledKey());
</span><span class="cx"> isCacheable = false;
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> m_items.remove(&item);
</span><span class="cx"> std::unique_ptr<CachedPage> cachedPage = WTFMove(item.m_cachedPage);
</span><span class="cx">
</span><del>- if (cachedPage->hasExpired() || (page && page->settings().resourceCachingDisabled())) {
</del><ins>+ if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
</ins><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (cachedPage->hasExpired() || (page && page->settings().resourceCachingDisabled())) {
</del><ins>+ if (cachedPage->hasExpired() || (page && page->isResourceCachingDisabled())) {
</ins><span class="cx"> LOG(PageCache, "Not restoring page for %s from back/forward cache because cache entry has expired", item.url().string().ascii().data());
</span><span class="cx"> logPageCacheFailureDiagnosticMessage(page, DiagnosticLoggingKeys::expiredKey());
</span><span class="cx"> remove(item);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -2155,8 +2155,10 @@
</span><span class="cx">
</span><span class="cx"> CachePolicy FrameLoader::subresourceCachePolicy() const
</span><span class="cx"> {
</span><del>- if (m_frame.settings().resourceCachingDisabled())
- return CachePolicyReload;
</del><ins>+ if (Page* page = m_frame.page()) {
+ if (page->isResourceCachingDisabled())
+ return CachePolicyReload;
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_isComplete)
</span><span class="cx"> return CachePolicyVerify;
</span><span class="lines">@@ -2564,7 +2566,8 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadType loadType, bool mainResource)
</span><span class="cx"> {
</span><del>- bool cachingDisabled = frame().settings().resourceCachingDisabled();
</del><ins>+ Page* page = frame().page();
+ bool cachingDisabled = page && page->isResourceCachingDisabled();
</ins><span class="cx">
</span><span class="cx"> if (cachingDisabled)
</span><span class="cx"> request.setCachePolicy(ReloadIgnoringCacheData);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -930,12 +930,14 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return CachePolicyVerify;
</span><span class="cx">
</span><del>- if (frame->settings().resourceCachingDisabled())
- return CachePolicyReload;
-
</del><span class="cx"> if (type != CachedResource::MainResource)
</span><span class="cx"> return frame->loader().subresourceCachePolicy();
</span><del>-
</del><ins>+
+ if (Page* page = frame->page()) {
+ if (page->isResourceCachingDisabled())
+ return CachePolicyReload;
+ }
+
</ins><span class="cx"> switch (frame->loader().loadType()) {
</span><span class="cx"> case FrameLoadType::ReloadFromOrigin:
</span><span class="cx"> case FrameLoadType::Reload:
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/page/Page.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -514,6 +514,9 @@
</span><span class="cx"> String captionUserPreferencesStyleSheet();
</span><span class="cx"> void setCaptionUserPreferencesStyleSheet(const String&);
</span><span class="cx">
</span><ins>+ bool isResourceCachingDisabled() const { return m_resourceCachingDisabled; }
+ void setResourceCachingDisabled(bool disabled) { m_resourceCachingDisabled = disabled; }
+
</ins><span class="cx"> private:
</span><span class="cx"> WEBCORE_EXPORT void initGroup();
</span><span class="cx">
</span><span class="lines">@@ -694,8 +697,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_allowsMediaDocumentInlinePlayback { false };
</span><span class="cx"> bool m_showAllPlugins { false };
</span><del>-
</del><span class="cx"> bool m_controlledByAutomation { false };
</span><ins>+ bool m_resourceCachingDisabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline PageGroup& Page::group()
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebCore/page/Settings.in 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -251,5 +251,3 @@
</span><span class="cx"> # enforces all frame sandbox flags (see enum SandboxFlag in SecurityContext.h), and also disables <meta http-equiv>
</span><span class="cx"> # processing and subframe loading.
</span><span class="cx"> contentDispositionAttachmentSandboxEnabled initial=false
</span><del>-
-resourceCachingDisabled initial=false
</del></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-03-20 Darin Adler <darin@apple.com>
+
+ Disable Caches in Safari's Develop menu does not disable caches.
+ https://bugs.webkit.org/show_bug.cgi?id=64483
+
+ Reviewed by Antti Koivisto.
+
+ Removed unneeded WebPreferences property; we don't need this for Legacy WebKit.
+
+ * WebView/WebPreferenceKeysPrivate.h: Removed
+ WebKitResourceCachingDisabledPreferenceKey.
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences isResourceCachingDisabled]): Deleted.
+ (-[WebPreferences setResourceCachingDisabled:]): Deleted.
+ * WebView/WebPreferencesPrivate.h: Removed resourceCachingDisabled property.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Removed code to update resourceCachingDisabled.
+
</ins><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Update build settings
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -161,7 +161,6 @@
</span><span class="cx"> #define WebKitMediaKeysStorageDirectoryKey @"WebKitMediaKeysStorageDirectory"
</span><span class="cx"> #define WebKitShadowDOMEnabledPreferenceKey @"WebKitShadowDOMEnabled"
</span><span class="cx"> #define WebKitCustomElementsEnabledPreferenceKey @"WebKitCustomElementsEnabled"
</span><del>-#define WebKitResourceCachingDisabledPreferenceKey @"WebKitResourceCachingDisabled"
</del><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> // These are private both because callers should be using the cover methods and because the
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -2700,16 +2700,6 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitCustomElementsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isResourceCachingDisabled
-{
- return [self _boolValueForKey:WebKitResourceCachingDisabledPreferenceKey];
-}
-
-- (void)setResourceCachingDisabled:(BOOL)flag
-{
- [self _setBoolValue:flag forKey:WebKitResourceCachingDisabledPreferenceKey];
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences (WebInternal)
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -484,6 +484,5 @@
</span><span class="cx"> @property (nonatomic) BOOL javaScriptMarkupEnabled;
</span><span class="cx"> @property (nonatomic) BOOL mediaDataLoadsAutomatically;
</span><span class="cx"> @property (nonatomic) BOOL attachmentElementEnabled;
</span><del>-@property (nonatomic, getter=isResourceCachingDisabled) BOOL resourceCachingDisabled;
</del><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -2516,8 +2516,6 @@
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> settings.setAttachmentElementEnabled([preferences attachmentElementEnabled]);
</span><span class="cx"> #endif
</span><del>-
- settings.setResourceCachingDisabled(preferences.resourceCachingDisabled);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline IMP getMethod(id o, SEL s)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-03-20 Darin Adler <darin@apple.com>
+
+ Disable Caches in Safari's Develop menu does not disable caches.
+ https://bugs.webkit.org/show_bug.cgi?id=64483
+
+ Reviewed by Antti Koivisto.
+
+ Moved functions from WKPreferences to WKPage.
+
+ * Shared/WebPreferencesDefinitions.h: Removed ResourceCachingDisabled.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetResourceCachingDisabled): Added.
+ (WKPageSetResourceCachingDisabled): Added.
+ * UIProcess/API/C/WKPagePrivate.h: Added above functions.
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetResourceCachingDisabled): Deleted.
+ (WKPreferencesGetResourceCachingDisabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h: Deleted above functions.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setResourceCachingDisabled): Added.
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::isResourceCachingDisabled): Added.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Removed code to set the setting
+ for resourceCachingDisabled..
+ (WebKit::WebPage::setResourceCachingDisabled): Added.
+ * WebProcess/WebPage/WebPage.h: Declared setResourceCachingDisabled.
+ * WebProcess/WebPage/WebPage.messages.in: Added SetResourceCachingDisabled.
+
</ins><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Update build settings
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -227,7 +227,6 @@
</span><span class="cx"> macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ShadowDOMEnabled, shadowDOMEnabled, Bool, bool, true) \
</span><span class="cx"> macro(CustomElementsEnabled, customElementsEnabled, Bool, bool, false) \
</span><del>- macro(ResourceCachingDisabled, resourceCachingDisabled, Bool, bool, false) \
</del><span class="cx"> FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
</span><span class="cx"> \
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -2724,6 +2724,16 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WKPageGetResourceCachingDisabled(WKPageRef page)
+{
+ return toImpl(page)->isResourceCachingDisabled();
+}
+
+void WKPageSetResourceCachingDisabled(WKPageRef page, bool disabled)
+{
+ toImpl(page)->setResourceCachingDisabled(disabled);
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> // -- DEPRECATED --
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -142,6 +142,9 @@
</span><span class="cx"> typedef void (*WKPagePostPresentationUpdateFunction)(WKErrorRef, void*);
</span><span class="cx"> WK_EXPORT void WKPageCallAfterNextPresentationUpdate(WKPageRef page, void* context, WKPagePostPresentationUpdateFunction function);
</span><span class="cx">
</span><ins>+WK_EXPORT bool WKPageGetResourceCachingDisabled(WKPageRef page);
+WK_EXPORT void WKPageSetResourceCachingDisabled(WKPageRef page, bool disabled);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1506,13 +1506,3 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(preferencesRef)->shadowDOMEnabled();
</span><span class="cx"> }
</span><del>-
-void WKPreferencesSetResourceCachingDisabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setResourceCachingDisabled(flag);
-}
-
-bool WKPreferencesGetResourceCachingDisabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->resourceCachingDisabled();
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -419,10 +419,6 @@
</span><span class="cx"> WK_EXPORT void WKPreferencesSetCustomElementsEnabled(WKPreferencesRef, bool flag);
</span><span class="cx"> WK_EXPORT bool WKPreferencesGetCustomElementsEnabled(WKPreferencesRef);
</span><span class="cx">
</span><del>-// Defaults to false
-WK_EXPORT void WKPreferencesSetResourceCachingDisabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetResourceCachingDisabled(WKPreferencesRef);
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -6222,4 +6222,17 @@
</span><span class="cx"> m_pageClient.didRestoreScrollPosition();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setResourceCachingDisabled(bool disabled)
+{
+ if (m_isResourceCachingDisabled == disabled)
+ return;
+
+ m_isResourceCachingDisabled = disabled;
+
+ if (!isValid())
+ return;
+
+ m_process->send(Messages::WebPage::SetResourceCachingDisabled(disabled), m_pageID);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1098,6 +1098,9 @@
</span><span class="cx">
</span><span class="cx"> void setFocus(bool focused);
</span><span class="cx">
</span><ins>+ bool isResourceCachingDisabled() const { return m_isResourceCachingDisabled; }
+ void setResourceCachingDisabled(bool);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPageProxy(PageClient&, WebProcessProxy&, uint64_t pageID, Ref<API::PageConfiguration>&&);
</span><span class="cx"> void platformInitialize();
</span><span class="lines">@@ -1794,6 +1797,8 @@
</span><span class="cx">
</span><span class="cx"> WebCore::MediaProducer::MediaStateFlags m_mediaState { WebCore::MediaProducer::IsNotPlaying };
</span><span class="cx">
</span><ins>+ bool m_isResourceCachingDisabled { false };
+
</ins><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> bool m_hasMediaSessionWithActiveMediaElements { false };
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -3045,8 +3045,6 @@
</span><span class="cx">
</span><span class="cx"> settings.setShouldDispatchJavaScriptWindowOnErrorEvents(true);
</span><span class="cx">
</span><del>- settings.setResourceCachingDisabled(store.getBoolValueForKey(WebPreferencesKey::resourceCachingDisabledKey()));
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #include <WebKitAdditions/WebPagePreferences.cpp>
</span><span class="cx"> #endif
</span><span class="lines">@@ -5263,4 +5261,9 @@
</span><span class="cx"> send(Messages::WebPageProxy::DidRestoreScrollPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::setResourceCachingDisabled(bool disabled)
+{
+ m_page->setResourceCachingDisabled(disabled);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -1194,6 +1194,8 @@
</span><span class="cx"> void didEndRequestInstallMissingMediaPlugins(uint32_t result);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ void setResourceCachingDisabled(bool);
+
</ins><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::Page> m_page;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (198475 => 198476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-03-20 17:20:45 UTC (rev 198475)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-03-20 20:08:59 UTC (rev 198476)
</span><span class="lines">@@ -427,4 +427,6 @@
</span><span class="cx"> #if ENABLE(VIDEO) && USE(GSTREAMER)
</span><span class="cx"> DidEndRequestInstallMissingMediaPlugins(uint32_t result)
</span><span class="cx"> #endif
</span><ins>+
+ SetResourceCachingDisabled(bool disabled)
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>