<!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>[186437] releases/WebKitGTK/webkit-2.8</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/186437">186437</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2015-07-07 03:58:38 -0700 (Tue, 07 Jul 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>PNG mask images are loaded with Accept:image/svg+xml

https://bugs.webkit.org/show_bug.cgi?id=146509

Source/WebCore:

rdar://problem/21584740

Reviewed by Simon Fraser.

For some strange reason MaskImageOperation code loads all mask images, including non-SVG ones

using CachedSVGDocument. Resulting bad accept header may cause server to reject the request.

This is far from ideal but as a quick fix we can override the accept header for mask images to

allow any image type.

Test: http/tests/misc/mask-image-accept.html

* loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource):

* loader/cache/CachedResourceRequest.h:

(WebCore::CachedResourceRequest::acceptOverride):

(WebCore::CachedResourceRequest::setAcceptOverride):

* loader/cache/CachedSVGDocumentReference.cpp:

(WebCore::CachedSVGDocumentReference::load):

* loader/cache/CachedSVGDocumentReference.h:

(WebCore::CachedSVGDocumentReference::loadRequested):

(WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType):

(WebCore::CachedSVGDocumentReference::document):

* platform/graphics/MaskImageOperation.cpp:

(WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):

LayoutTests:

Reviewed by Simon Fraser.

* http/tests/misc/mask-image-accept-expected.html: Added.

* http/tests/misc/mask-image-accept.html: Added.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedResourceLoadercpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedResourceRequesth">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedSVGDocumentReferencecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedSVGDocumentReferenceh">releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsMaskImageOperationcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/MaskImageOperation.cpp</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit28LayoutTestshttptestsmiscmaskimageacceptexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept-expected.html</a></li>

<li><a href="#releasesWebKitGTKwebkit28LayoutTestshttptestsmiscmaskimageaccepthtml">releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept.html</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -1,3 +1,13 @@

</span><ins>+2015-07-01  Antti Koivisto  &lt;antti@apple.com&gt;

+

+        PNG mask images are loaded with Accept:image/svg+xml

+        https://bugs.webkit.org/show_bug.cgi?id=146509

+

+        Reviewed by Simon Fraser.

+

+        * http/tests/misc/mask-image-accept-expected.html: Added.

+        * http/tests/misc/mask-image-accept.html: Added.

+

</ins><span class="cx"> 2015-06-30  Zalan Bujtas  &lt;zalan@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Frame flattening: Hit-testing an iframe could end up destroying the associated inline tree context.

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28LayoutTestshttptestsmiscmaskimageacceptexpectedhtml"></a>

<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept-expected.html (0 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept-expected.html                                (rev 0)

+++ releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept-expected.html        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -0,0 +1,10 @@

</span><ins>+&lt;html&gt;

+&lt;head&gt;

+&lt;style&gt;

+#test { width:100px; height:100px; background-color: green;}

+&lt;/style&gt;

+&lt;/head&gt;

+&lt;body&gt;

+&lt;div id=&quot;test&quot;&gt;&lt;/div&gt;

+&lt;/body&gt;

+&lt;/html&gt;

</ins></span></pre></div>

<a id="releasesWebKitGTKwebkit28LayoutTestshttptestsmiscmaskimageaccepthtml"></a>

<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept.html (0 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept.html                                (rev 0)

+++ releases/WebKitGTK/webkit-2.8/LayoutTests/http/tests/misc/mask-image-accept.html        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -0,0 +1,10 @@

</span><ins>+&lt;html&gt;

+&lt;head&gt;

+&lt;style&gt;

+#test { -webkit-mask-image: url(resources/image-checks-for-accept.php); width:100px; height:100px; background-color: green;}

+&lt;/style&gt;

+&lt;/head&gt;

+&lt;body&gt;

+&lt;div id=&quot;test&quot;&gt;&lt;/div&gt;

+&lt;/body&gt;

+&lt;/html&gt;

</ins></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -1,3 +1,33 @@

</span><ins>+2015-07-01  Antti Koivisto  &lt;antti@apple.com&gt;

+

+        PNG mask images are loaded with Accept:image/svg+xml

+        https://bugs.webkit.org/show_bug.cgi?id=146509

+        rdar://problem/21584740

+

+        Reviewed by Simon Fraser.

+

+        For some strange reason MaskImageOperation code loads all mask images, including non-SVG ones

+        using CachedSVGDocument. Resulting bad accept header may cause server to reject the request.

+

+        This is far from ideal but as a quick fix we can override the accept header for mask images to

+        allow any image type.

+

+        Test: http/tests/misc/mask-image-accept.html

+

+        * loader/cache/CachedResourceLoader.cpp:

+        (WebCore::CachedResourceLoader::requestResource):

+        * loader/cache/CachedResourceRequest.h:

+        (WebCore::CachedResourceRequest::acceptOverride):

+        (WebCore::CachedResourceRequest::setAcceptOverride):

+        * loader/cache/CachedSVGDocumentReference.cpp:

+        (WebCore::CachedSVGDocumentReference::load):

+        * loader/cache/CachedSVGDocumentReference.h:

+        (WebCore::CachedSVGDocumentReference::loadRequested):

+        (WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType):

+        (WebCore::CachedSVGDocumentReference::document):

+        * platform/graphics/MaskImageOperation.cpp:

+        (WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):

+

</ins><span class="cx"> 2015-06-30  Zalan Bujtas  &lt;zalan@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Frame flattening: Hit-testing an iframe could end up destroying the associated inline tree context.

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedResourceLoadercpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -518,6 +518,9 @@

</span><span class="cx">         resource-&gt;setLoadPriority(request.priority());

</span><span class="cx"> 

</span><span class="cx">     if ((policy != Use || resource-&gt;stillNeedsLoad()) &amp;&amp; CachedResourceRequest::NoDefer == request.defer()) {

</span><ins>+        if (request.acceptOverride())

+            resource-&gt;setAccept(request.acceptOverride().value());

+

</ins><span class="cx">         resource-&gt;load(*this, request.options());

</span><span class="cx"> 

<span class="cx">         // We don't support immediate loads, but we do support immediate failure.

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedResourceRequesth"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceRequest.h (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceRequest.h        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedResourceRequest.h        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -52,12 +52,14 @@

</span><span class="cx">     const ResourceLoaderOptions&amp; options() const { return m_options; }

</span><span class="cx">     void setOptions(const ResourceLoaderOptions&amp; options) { m_options = options; }

</span><span class="cx">     const Optional&lt;ResourceLoadPriority&gt;&amp; priority() const { return m_priority; }

</span><ins>+    const Optional&lt;String&gt;&amp; acceptOverride() const { return m_acceptOverride; }

</ins><span class="cx">     bool forPreload() const { return m_forPreload; }

</span><span class="cx">     void setForPreload(bool forPreload) { m_forPreload = forPreload; }

</span><span class="cx">     DeferOption defer() const { return m_defer; }

</span><span class="cx">     void setDefer(DeferOption defer) { m_defer = defer; }

</span><span class="cx">     void setInitiator(PassRefPtr&lt;Element&gt;);

</span><span class="cx">     void setInitiator(const AtomicString&amp; name);

</span><ins>+    void setAcceptOverride(const String&amp; accept) { m_acceptOverride = accept; }

</ins><span class="cx">     const AtomicString&amp; initiatorName() const;

</span><span class="cx"> 

</span><span class="cx"> private:

</span><span class="lines">@@ -65,6 +67,7 @@

</span><span class="cx">     String m_charset;

</span><span class="cx">     ResourceLoaderOptions m_options;

</span><span class="cx">     Optional&lt;ResourceLoadPriority&gt; m_priority;

</span><ins>+    Optional&lt;String&gt; m_acceptOverride;

</ins><span class="cx">     bool m_forPreload;

</span><span class="cx">     DeferOption m_defer;

</span><span class="cx">     RefPtr&lt;Element&gt; m_initiatorElement;

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedSVGDocumentReferencecpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -60,6 +60,8 @@

</span><span class="cx"> 

</span><span class="cx">     CachedResourceRequest request(ResourceRequest(loader.document()-&gt;completeURL(m_url)));

</span><span class="cx">     request.setInitiator(cachedResourceRequestInitiators().css);

</span><ins>+    if (m_acceptsAnyImageType)

+        request.setAcceptOverride(&quot;image/*&quot;);

</ins><span class="cx">     m_document = loader.requestSVGDocument(request);

</span><span class="cx">     if (m_document) {

</span><span class="cx">         m_document-&gt;setCanReuse(m_canReuseResource);

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreloadercacheCachedSVGDocumentReferenceh"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.h (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.h        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/loader/cache/CachedSVGDocumentReference.h        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -43,6 +43,7 @@

</span><span class="cx"> 

</span><span class="cx">     void load(CachedResourceLoader&amp;);

</span><span class="cx">     bool loadRequested() const { return m_loadRequested; }

</span><ins>+    void setAcceptsAnyImageType() { m_acceptsAnyImageType = true; }

</ins><span class="cx"> 

</span><span class="cx">     CachedSVGDocument* document() { return m_document.get(); }

</span><span class="cx"> 

</span><span class="lines">@@ -52,6 +53,7 @@

</span><span class="cx">     bool m_loadRequested;

</span><span class="cx">     CachedSVGDocumentClient* m_additionalDocumentClient;

</span><span class="cx">     bool m_canReuseResource;

</span><ins>+    bool m_acceptsAnyImageType { false };

</ins><span class="cx"> };

</span><span class="cx"> 

</span><span class="cx"> };

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsMaskImageOperationcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/MaskImageOperation.cpp (186436 => 186437)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-07-07 10:49:00 UTC (rev 186436)

+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-07-07 10:58:38 UTC (rev 186437)

</span><span class="lines">@@ -171,8 +171,12 @@

</span><span class="cx">     if (image())

</span><span class="cx">         return nullptr;

</span><span class="cx"> 

</span><del>-    if (!m_cachedSVGDocumentReference.get())

</del><ins>+    if (!m_cachedSVGDocumentReference.get()) {

</ins><span class="cx">         m_cachedSVGDocumentReference = std::make_unique&lt;CachedSVGDocumentReference&gt;(m_url, this, false);

<ins>+        // FIXME: For some strange reason we load all mask resources using CachedSVGDocument.

+        //        This requires overriding SVG mime type in Accept header or server may reject the request.

+        m_cachedSVGDocumentReference-&gt;setAcceptsAnyImageType();

+    }

</ins><span class="cx">     return m_cachedSVGDocumentReference.get();

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -197,9 +201,10 @@

</span><span class="cx">             }

</span><span class="cx">         }

</span><span class="cx">     }

</span><del>-    

</del><ins>+

</ins><span class="cx">     // If no valid mask was found, this is not a valid SVG document or it specified an invalid fragment identifier.

<span class="cx">     // Fallback to the normal way of loading the document in an Image object.

<ins>+    // FIXME: This is silly.

</ins><span class="cx">     if (!validMaskFound) {

<span class="cx">         // Get the resource loader, acquire the resource buffer and load it into an image.

</span><span class="cx">         ASSERT(cachedSVGDocument-&gt;loader());

</span></span></pre>

</div>

</div>

</body>

</html>