Title: [188069] branches/safari-601.1.46-branch/Source/WebCore
Revision
188069
Author
bshaf...@apple.com
Date
2015-08-06 15:38:18 -0700 (Thu, 06 Aug 2015)

Log Message

Merged r188051.  rdar://problem/22028179

Modified Paths

Diff

Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188068 => 188069)


--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-08-06 22:37:47 UTC (rev 188068)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog	2015-08-06 22:38:18 UTC (rev 188069)
@@ -1,5 +1,23 @@
 2015-08-06  Babak Shafiei  <bshaf...@apple.com>
 
+        Merge r188051.
+
+    2015-08-06  Eric Carlson  <eric.carl...@apple.com>
+
+            Do not enforce "content-disposition: attachment" sandbox restrictions on a MediaDocument
+            https://bugs.webkit.org/show_bug.cgi?id=147734
+            rdar://problem/22028179
+
+            Reviewed by Dean Jackson.
+
+            Test to follow, see https://bugs.webkit.org/show_bug.cgi?id=147735
+
+            * dom/Document.cpp:
+            (WebCore::Document::shouldEnforceContentDispositionAttachmentSandbox): Return
+              early if the Document is a MediaDocument.
+
+2015-08-06  Babak Shafiei  <bshaf...@apple.com>
+
         Merge r187693.
 
     2015-07-31  Myles C. Maxfield  <mmaxfi...@apple.com>

Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp (188068 => 188069)


--- branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-08-06 22:37:47 UTC (rev 188068)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/Document.cpp	2015-08-06 22:38:18 UTC (rev 188069)
@@ -6717,6 +6717,9 @@
     if (m_isSynthesized)
         return false;
 
+    if (isMediaDocument())
+        return false;
+
     bool contentDispositionAttachmentSandboxEnabled = settings() && settings()->contentDispositionAttachmentSandboxEnabled();
     bool responseIsAttachment = false;
     if (DocumentLoader* documentLoader = m_frame ? m_frame->loader().activeDocumentLoader() : nullptr)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to