<!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>[198393] 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/198393">198393</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 00:56:20 -0700 (Fri, 18 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:
Add a new setting, ResourceCachingDisabled, for use in future versions of Safari.
* history/PageCache.cpp:
(WebCore::canCachePage): Check resourceCachingDisabled and return false.
(WebCore::PageCache::take): Check resourceCachingDisabled, and return null.
(WebCore::PageCache::get): Ditto.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::subresourceCachePolicy): Check resourceCachingDisabled, and
request a reload.
(WebCore::FrameLoader::addExtraFieldsToRequest): Check resourceCachingDisabled, and
set the cache policy to trigger a reload.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::cachePolicy): Check resourceCachingDisabled, and
request a reload.
* page/Settings.in: Added resourceCachingDisabled.
Source/WebKit/mac:
* WebView/WebPreferenceKeysPrivate.h: Added ResourceCachingDisabled.
* WebView/WebPreferences.mm:
(-[WebPreferences isResourceCachingDisabled]): Added.
(-[WebPreferences setResourceCachingDisabled:]): Added.
* WebView/WebPreferencesPrivate.h: Added resourceCachingDisabled.
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]): Push resourceCachingDisabled into WebCore.
Source/WebKit2:
* Shared/WebPreferencesDefinitions.h: Added ResourceCachingDisabled.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetResourceCachingDisabled): Added.
(WKPreferencesGetResourceCachingDisabled): Added.
* UIProcess/API/C/WKPreferencesRefPrivate.h: Ditto.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences): Push ResourceCachingDisabled setting
into WebCore.</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="#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="#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="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebCore/ChangeLog 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-03-18 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.
+
+ Add a new setting, ResourceCachingDisabled, for use in future versions of Safari.
+
+ * history/PageCache.cpp:
+ (WebCore::canCachePage): Check resourceCachingDisabled and return false.
+ (WebCore::PageCache::take): Check resourceCachingDisabled, and return null.
+ (WebCore::PageCache::get): Ditto.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::subresourceCachePolicy): Check resourceCachingDisabled, and
+ request a reload.
+ (WebCore::FrameLoader::addExtraFieldsToRequest): Check resourceCachingDisabled, and
+ set the cache policy to trigger a reload.
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::cachePolicy): Check resourceCachingDisabled, and
+ request a reload.
+
+ * page/Settings.in: Added resourceCachingDisabled.
+
</ins><span class="cx"> 2016-03-18 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Mac][cmake] Unreviewed speculative buildfix. Just for fun.
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryPageCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/PageCache.cpp (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/PageCache.cpp 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebCore/history/PageCache.cpp 2016-03-18 07:56:20 UTC (rev 198393)
</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()) {
</del><ins>+ if (!page.settings().usesPageCache() || page.settings().resourceCachingDisabled()) {
</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()) {
</del><ins>+ if (cachedPage->hasExpired() || (page && page->settings().resourceCachingDisabled())) {
</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()) {
</del><ins>+ if (cachedPage->hasExpired() || (page && page->settings().resourceCachingDisabled())) {
</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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -2155,6 +2155,9 @@
</span><span class="cx">
</span><span class="cx"> CachePolicy FrameLoader::subresourceCachePolicy() const
</span><span class="cx"> {
</span><ins>+ if (m_frame.settings().resourceCachingDisabled())
+ return CachePolicyReload;
+
</ins><span class="cx"> if (m_isComplete)
</span><span class="cx"> return CachePolicyVerify;
</span><span class="cx">
</span><span class="lines">@@ -2561,6 +2564,11 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadType loadType, bool mainResource)
</span><span class="cx"> {
</span><ins>+ bool cachingDisabled = frame().settings().resourceCachingDisabled();
+
+ if (cachingDisabled)
+ request.setCachePolicy(ReloadIgnoringCacheData);
+
</ins><span class="cx"> // Don't set the cookie policy URL if it's already been set.
</span><span class="cx"> // But make sure to set it on all requests regardless of protocol, as it has significance beyond the cookie policy (<rdar://problem/6616664>).
</span><span class="cx"> if (request.firstPartyForCookies().isEmpty()) {
</span><span class="lines">@@ -2576,7 +2584,10 @@
</span><span class="cx">
</span><span class="cx"> applyUserAgent(request);
</span><span class="cx">
</span><del>- if (!mainResource) {
</del><ins>+ if (cachingDisabled) {
+ // Cache policy was already set above in the non-HTTP-specific code.
+ loadType = FrameLoadType::ReloadFromOrigin;
+ } else if (!mainResource) {
</ins><span class="cx"> if (request.isConditional())
</span><span class="cx"> request.setCachePolicy(ReloadIgnoringCacheData);
</span><span class="cx"> else if (documentLoader()->isLoadingInAPISense()) {
</span><span class="lines">@@ -2613,7 +2624,7 @@
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (mainResource)
</span><span class="cx"> request.setHTTPAccept(defaultAcceptHeader);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -923,13 +923,17 @@
</span><span class="cx">
</span><span class="cx"> CachePolicy CachedResourceLoader::cachePolicy(CachedResource::Type type) const
</span><span class="cx"> {
</span><del>- if (!frame())
</del><ins>+ Frame* frame = this->frame();
+ if (!frame)
</ins><span class="cx"> return CachePolicyVerify;
</span><span class="cx">
</span><ins>+ if (frame->settings().resourceCachingDisabled())
+ return CachePolicyReload;
+
</ins><span class="cx"> if (type != CachedResource::MainResource)
</span><del>- return frame()->loader().subresourceCachePolicy();
</del><ins>+ return frame->loader().subresourceCachePolicy();
</ins><span class="cx">
</span><del>- switch (frame()->loader().loadType()) {
</del><ins>+ switch (frame->loader().loadType()) {
</ins><span class="cx"> case FrameLoadType::ReloadFromOrigin:
</span><span class="cx"> case FrameLoadType::Reload:
</span><span class="cx"> return CachePolicyReload;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebCore/page/Settings.in 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -251,3 +251,5 @@
</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><ins>+
+resourceCachingDisabled initial=false
</ins></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-18 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.
+
+ * WebView/WebPreferenceKeysPrivate.h: Added ResourceCachingDisabled.
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences isResourceCachingDisabled]): Added.
+ (-[WebPreferences setResourceCachingDisabled:]): Added.
+ * WebView/WebPreferencesPrivate.h: Added resourceCachingDisabled.
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]): Push resourceCachingDisabled into WebCore.
+
</ins><span class="cx"> 2016-03-17 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [cmake][Mac] Unreviewed speculative buildfix after r198088. Just for fun.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferenceKeysPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> #define WebKitMediaKeysStorageDirectoryKey @"WebKitMediaKeysStorageDirectory"
</span><span class="cx"> #define WebKitShadowDOMEnabledPreferenceKey @"WebKitShadowDOMEnabled"
</span><span class="cx"> #define WebKitCustomElementsEnabledPreferenceKey @"WebKitCustomElementsEnabled"
</span><ins>+#define WebKitResourceCachingDisabledPreferenceKey @"WebKitResourceCachingDisabled"
</ins><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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -704,7 +704,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setUnsignedIntValue:(unsigned int)value forKey:(NSString *)key
</span><del>-{ if ([self _unsignedIntValueForKey:key] == value)
</del><ins>+{
+ if ([self _unsignedIntValueForKey:key] == value)
</ins><span class="cx"> return;
</span><span class="cx"> NSString *_key = KEY(key);
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -2699,6 +2700,16 @@
</span><span class="cx"> [self _setBoolValue:flag forKey:WebKitCustomElementsEnabledPreferenceKey];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isResourceCachingDisabled
+{
+ return [self _boolValueForKey:WebKitResourceCachingDisabledPreferenceKey];
+}
+
+- (void)setResourceCachingDisabled:(BOOL)flag
+{
+ [self _setBoolValue:flag forKey:WebKitResourceCachingDisabledPreferenceKey];
+}
+
</ins><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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -484,5 +484,6 @@
</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><ins>+@property (nonatomic, getter=isResourceCachingDisabled) BOOL resourceCachingDisabled;
</ins><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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -2516,6 +2516,8 @@
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> settings.setAttachmentElementEnabled([preferences attachmentElementEnabled]);
</span><span class="cx"> #endif
</span><ins>+
+ settings.setResourceCachingDisabled(preferences.resourceCachingDisabled);
</ins><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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-18 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.
+
+ * Shared/WebPreferencesDefinitions.h: Added ResourceCachingDisabled.
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetResourceCachingDisabled): Added.
+ (WKPreferencesGetResourceCachingDisabled): Added.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h: Ditto.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Push ResourceCachingDisabled setting
+ into WebCore.
+
</ins><span class="cx"> 2016-03-18 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Try to fix GTK+ debug build after r198364.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -227,6 +227,7 @@
</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><ins>+ macro(ResourceCachingDisabled, resourceCachingDisabled, Bool, bool, false) \
</ins><span class="cx"> FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
</span><span class="cx"> \
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -1506,3 +1506,13 @@
</span><span class="cx"> {
</span><span class="cx"> return toImpl(preferencesRef)->shadowDOMEnabled();
</span><span class="cx"> }
</span><ins>+
+void WKPreferencesSetResourceCachingDisabled(WKPreferencesRef preferencesRef, bool flag)
+{
+ toImpl(preferencesRef)->setResourceCachingDisabled(flag);
+}
+
+bool WKPreferencesGetResourceCachingDisabled(WKPreferencesRef preferencesRef)
+{
+ return toImpl(preferencesRef)->resourceCachingDisabled();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencesRefPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -419,6 +419,10 @@
</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><ins>+// Defaults to false
+WK_EXPORT void WKPreferencesSetResourceCachingDisabled(WKPreferencesRef, bool flag);
+WK_EXPORT bool WKPreferencesGetResourceCachingDisabled(WKPreferencesRef);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</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 (198392 => 198393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-18 07:41:54 UTC (rev 198392)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-18 07:56:20 UTC (rev 198393)
</span><span class="lines">@@ -3045,6 +3045,8 @@
</span><span class="cx">
</span><span class="cx"> settings.setShouldDispatchJavaScriptWindowOnErrorEvents(true);
</span><span class="cx">
</span><ins>+ settings.setResourceCachingDisabled(store.getBoolValueForKey(WebPreferencesKey::resourceCachingDisabledKey()));
+
</ins><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #include <WebKitAdditions/WebPagePreferences.cpp>
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>