<!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>[188003] branches/safari-600.1.4.17-branch</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/188003">188003</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-08-05 16:49:51 -0700 (Wed, 05 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Roll out <a href="http://trac.webkit.org/projects/webkit/changeset/186982">r186982</a>. rdar://problem/21709404</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001417branchLayoutTestsChangeLog">branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreChangeLog">branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoredomDocumentcpp">branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoredomDocumenth">branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.h</a></li>
<li><a href="#branchessafari6001417branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-600.1.4.17-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#branchessafari6001417branchSourceWebCorepageSettingsin">branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2ChangeLog">branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari6001417branchToolsChangeLog">branches/safari-600.1.4.17-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001417branchToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp">branches/safari-600.1.4.17-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>branches/safari-600.1.4.17-branch/LayoutTests/http/tests/contentdispositionattachmentsandbox/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001417branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/LayoutTests/ChangeLog        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Roll out r186982.
+
+2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
</ins><span class="cx">         Roll out r186988.
</span><span class="cx"> 
</span><span class="cx"> 2015-07-29  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Roll out r186982.
+
</ins><span class="cx"> 2015-07-30  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Roll out r186895.
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.cpp        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -2807,24 +2807,8 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!equiv.isNull() &amp;&amp; !content.isNull());
</span><span class="cx"> 
</span><del>-    HttpEquivPolicy policy = httpEquivPolicy();
-    if (policy != HttpEquivPolicy::Enabled) {
-        String reason;
-        switch (policy) {
-        case HttpEquivPolicy::Enabled:
-            ASSERT_NOT_REACHED();
-            break;
-        case HttpEquivPolicy::DisabledBySettings:
-            reason = &quot;by the embedder.&quot;;
-            break;
-        case HttpEquivPolicy::DisabledByContentDispositionAttachmentSandbox:
-            reason = &quot;for documents with Content-Disposition: attachment.&quot;;
-            break;
-        }
-        String message = &quot;http-equiv '&quot; + equiv + &quot;' is disabled &quot; + reason;
-        addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
</del><ins>+    if (page() &amp;&amp; !page()-&gt;settings().httpEquivEnabled())
</ins><span class="cx">         return;
</span><del>-    }
</del><span class="cx"> 
</span><span class="cx">     Frame* frame = this-&gt;frame();
</span><span class="cx"> 
</span><span class="lines">@@ -4688,8 +4672,15 @@
</span><span class="cx">     m_cookieURL = m_url;
</span><span class="cx">     enforceSandboxFlags(m_frame-&gt;loader().effectiveSandboxFlags());
</span><span class="cx"> 
</span><del>-    if (shouldEnforceContentDispositionAttachmentSandbox())
-        enforceSandboxFlags(SandboxAll);
</del><ins>+#if PLATFORM(IOS)
+    // On iOS we display attachments inline regardless of whether the response includes
+    // the HTTP header &quot;Content-Disposition: attachment&quot;. So, we enforce a unique
+    // security origin for such documents. As an optimization, we don't need to parse
+    // the responde header (i.e. call ResourceResponse::isAttachment()) for a synthesized
+    // document because such documents cannot be an attachment.
+    if (!m_isSynthesized &amp;&amp; m_frame-&gt;loader().activeDocumentLoader()-&gt;response().isAttachment())
+        enforceSandboxFlags(SandboxOrigin);
+#endif
</ins><span class="cx"> 
</span><span class="cx">     setSecurityOrigin(isSandboxed(SandboxOrigin) ? SecurityOrigin::createUnique() : SecurityOrigin::create(m_url));
</span><span class="cx">     setContentSecurityPolicy(std::make_unique&lt;ContentSecurityPolicy&gt;(this));
</span><span class="lines">@@ -5768,15 +5759,6 @@
</span><span class="cx">     wheelEventHandlerCountChanged(this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-HttpEquivPolicy Document::httpEquivPolicy() const
-{
-    if (shouldEnforceContentDispositionAttachmentSandbox())
-        return HttpEquivPolicy::DisabledByContentDispositionAttachmentSandbox;
-    if (page() &amp;&amp; !page()-&gt;settings().httpEquivEnabled())
-        return HttpEquivPolicy::DisabledBySettings;
-    return HttpEquivPolicy::Enabled;
-}
-
</del><span class="cx"> void Document::didRemoveWheelEventHandler()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(m_wheelEventHandlerCount &gt; 0);
</span><span class="lines">@@ -6228,17 +6210,4 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-bool Document::shouldEnforceContentDispositionAttachmentSandbox() const
-{
-    if (m_isSynthesized)
-        return false;
-
-    bool contentDispositionAttachmentSandboxEnabled = settings() &amp;&amp; settings()-&gt;contentDispositionAttachmentSandboxEnabled();
-    bool responseIsAttachment = false;
-    if (DocumentLoader* documentLoader = m_frame ? m_frame-&gt;loader().activeDocumentLoader() : nullptr)
-        responseIsAttachment = documentLoader-&gt;response().isAttachment();
-
-    return contentDispositionAttachmentSandboxEnabled &amp;&amp; responseIsAttachment;
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.h (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.h        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/dom/Document.h        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -254,12 +254,6 @@
</span><span class="cx">     LimitedQuirksMode = 1 &lt;&lt; 2
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-enum class HttpEquivPolicy {
-    Enabled,
-    DisabledBySettings,
-    DisabledByContentDispositionAttachmentSandbox
-};
-
</del><span class="cx"> class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext {
</span><span class="cx"> public:
</span><span class="cx">     static PassRefPtr&lt;Document&gt; create(Frame* frame, const URL&amp; url)
</span><span class="lines">@@ -1286,7 +1280,6 @@
</span><span class="cx">     void setHasStyleWithViewportUnits() { m_hasStyleWithViewportUnits = true; }
</span><span class="cx">     bool hasStyleWithViewportUnits() const { return m_hasStyleWithViewportUnits; }
</span><span class="cx">     void updateViewportUnitsOnResize();
</span><del>-    bool shouldEnforceContentDispositionAttachmentSandbox() const;
</del><span class="cx"> 
</span><span class="cx"> protected:
</span><span class="cx">     enum ConstructionFlags { Synthesized = 1, NonRenderedPlaceholder = 1 &lt;&lt; 1 };
</span><span class="lines">@@ -1363,8 +1356,6 @@
</span><span class="cx"> 
</span><span class="cx">     void addListenerType(ListenerType listenerType) { m_listenerTypes |= listenerType; }
</span><span class="cx"> 
</span><del>-    HttpEquivPolicy httpEquivPolicy() const;
-
</del><span class="cx">     void didAssociateFormControlsTimerFired(Timer&lt;Document&gt;&amp;);
</span><span class="cx"> 
</span><span class="cx">     unsigned m_referencingNodeCount;
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -311,13 +311,6 @@
</span><span class="cx">     // any URL.
</span><span class="cx">     switch (type) {
</span><span class="cx">     case CachedResource::MainResource:
</span><del>-        if (HTMLFrameOwnerElement* ownerElement = frame() ? frame()-&gt;ownerElement() : nullptr) {
-            if (ownerElement-&gt;document().shouldEnforceContentDispositionAttachmentSandbox() &amp;&amp; !ownerElement-&gt;document().securityOrigin()-&gt;canRequest(url)) {
-                printAccessDeniedMessage(url);
-                return false;
-            }
-        }
-        FALLTHROUGH;
</del><span class="cx">     case CachedResource::ImageResource:
</span><span class="cx">     case CachedResource::CSSStyleSheet:
</span><span class="cx">     case CachedResource::Script:
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/page/Settings.in        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -231,9 +231,3 @@
</span><span class="cx"> allowNavigationToInvalidURL initial=false
</span><span class="cx"> 
</span><span class="cx"> httpEquivEnabled initial=true
</span><del>-
-# Some ports (e.g. iOS) might choose to display attachments inline, regardless of whether the response includes the
-# HTTP header &quot;Content-Disposition: attachment&quot;. This setting enables a sandbox around these attachments. The sandbox
-# enforces all frame sandbox flags (see enum SandboxFlag in SecurityContext.h), and also disables &lt;meta http-equiv&gt;
-# processing and subframe loading.
-contentDispositionAttachmentSandboxEnabled initial=false
</del></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/ChangeLog        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Roll out r186982.
+
</ins><span class="cx"> 2015-07-21  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r187103
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/WebView/WebView.mm        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1047,10 +1047,6 @@
</span><span class="cx"> #if USE(GLIB)
</span><span class="cx">     [self _scheduleGlibContextIterations];
</span><span class="cx"> #endif
</span><del>-
-#if PLATFORM(IOS)
-    _private-&gt;page-&gt;settings().setContentDispositionAttachmentSandboxEnabled(true);
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (id)_initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Roll out r186982.
+
</ins><span class="cx"> 2015-07-23  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r187248.
</span></span></pre></div>
<a id="branchessafari6001417branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -480,10 +480,6 @@
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; mimeType : parameters.mimeTypesWithCustomContentProviders)
</span><span class="cx">         m_mimeTypesWithCustomContentProviders.add(mimeType);
</span><del>-
-#if PLATFORM(IOS)
-    m_page-&gt;settings().setContentDispositionAttachmentSandboxEnabled(true);
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::reinitializeWebPage(const WebPageCreationParameters&amp; parameters)
</span></span></pre></div>
<a id="branchessafari6001417branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Tools/ChangeLog (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Tools/ChangeLog        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Tools/ChangeLog        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2015-08-05  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Roll out r186982.
+
</ins><span class="cx"> 2015-07-17  Andy Estes  &lt;aestes@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r186982. rdar://problem/21709404
</span></span></pre></div>
<a id="branchessafari6001417branchToolsWebKitTestRunnerInjectedBundleInjectedBundlePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.17-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (188002 => 188003)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.17-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp        2015-08-05 23:42:57 UTC (rev 188002)
+++ branches/safari-600.1.4.17-branch/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp        2015-08-05 23:49:51 UTC (rev 188003)
</span><span class="lines">@@ -1260,7 +1260,7 @@
</span><span class="cx"> 
</span><span class="cx"> WKBundlePagePolicyAction InjectedBundlePage::decidePolicyForResponse(WKBundlePageRef page, WKBundleFrameRef, WKURLResponseRef response, WKURLRequestRef, WKTypeRef*)
</span><span class="cx"> {
</span><del>-    if (InjectedBundle::singleton().testRunner()-&gt;isPolicyDelegateEnabled() &amp;&amp; WKURLResponseIsAttachment(response)) {
</del><ins>+    if (WKURLResponseIsAttachment(response)) {
</ins><span class="cx">         StringBuilder stringBuilder;
</span><span class="cx">         WKRetainPtr&lt;WKStringRef&gt; filename = adoptWK(WKURLResponseCopySuggestedFilename(response));
</span><span class="cx">         stringBuilder.appendLiteral(&quot;Policy delegate: resource is an attachment, suggested file name \'&quot;);
</span></span></pre>
</div>
</div>

</body>
</html>