<!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>[186390] trunk/Source/WebCore</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/186390">186390</a></dd>

<dt>Author</dt> <dd>simon.fraser@apple.com</dd>

<dt>Date</dt> <dd>2015-07-06 18:11:49 -0700 (Mon, 06 Jul 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Revert use of SVG &lt;mask&gt; elements for -webkit-mask-image (<a href="http://trac.webkit.org/projects/webkit/changeset/176798">r176798</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/177494">r177494</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/186180">r186180</a>)

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

Fixes rdar://problem/21435233.

This patch reverts <a href="http://trac.webkit.org/projects/webkit/changeset/186180">r186180</a>, but keeps the layout test.

This feature caused a number of regressions (bugs 141857, 146509, 146561), added new layering violations, and

was not being maintained, so revert it.

* loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::requestResource): Deleted.

* loader/cache/CachedResourceRequest.h:

(WebCore::CachedResourceRequest::acceptOverride): Deleted.

(WebCore::CachedResourceRequest::setAcceptOverride): Deleted.

* loader/cache/CachedSVGDocumentReference.cpp:

(WebCore::CachedSVGDocumentReference::load): Deleted.

* loader/cache/CachedSVGDocumentReference.h:

(WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType): Deleted.

* platform/graphics/MaskImageOperation.cpp:

(WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):

(WebCore::MaskImageOperation::notifyFinished):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>

<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>

<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp</a></li>

<li><a href="#trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh">trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h</a></li>

<li><a href="#trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp">trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/ChangeLog        2015-07-07 01:11:49 UTC (rev 186390)

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

</span><ins>+2015-07-06  Simon Fraser  &lt;simon.fraser@apple.com&gt;

+

+        Revert use of SVG &lt;mask&gt; elements for -webkit-mask-image (r176798, r177494, r186180)

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

+        

+        Fixes rdar://problem/21435233.

+

+        This patch reverts r186180, but keeps the layout test.

+

+        This feature caused a number of regressions (bugs 141857, 146509, 146561), added new layering violations, and

+        was not being maintained, so revert it.

+        

+        * loader/cache/CachedResourceLoader.cpp:

+        (WebCore::CachedResourceLoader::requestResource): Deleted.

+        * loader/cache/CachedResourceRequest.h:

+        (WebCore::CachedResourceRequest::acceptOverride): Deleted.

+        (WebCore::CachedResourceRequest::setAcceptOverride): Deleted.

+        * loader/cache/CachedSVGDocumentReference.cpp:

+        (WebCore::CachedSVGDocumentReference::load): Deleted.

+        * loader/cache/CachedSVGDocumentReference.h:

+        (WebCore::CachedSVGDocumentReference::setAcceptsAnyImageType): Deleted.

+        * platform/graphics/MaskImageOperation.cpp:

+        (WebCore::MaskImageOperation::ensureCachedSVGDocumentReference):

+        (WebCore::MaskImageOperation::notifyFinished):

+

</ins><span class="cx"> 2015-07-06  Daniel Bates  &lt;dabates@apple.com&gt;

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

</span><span class="cx">         Fix the Windows build following &lt;https://trac.webkit.org/changeset/186388&gt;

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

<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp        2015-07-07 01:11:49 UTC (rev 186390)

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

</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><del>-        if (request.acceptOverride())

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

-

</del><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="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h        2015-07-07 01:11:49 UTC (rev 186390)

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

</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><del>-    const Optional&lt;String&gt;&amp; acceptOverride() const { return m_acceptOverride; }

</del><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><del>-    void setAcceptOverride(const String&amp; accept) { m_acceptOverride = accept; }

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

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

</span><span class="cx">     void setInitiator(DocumentLoader&amp;);

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

</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><del>-    Optional&lt;String&gt; m_acceptOverride;

</del><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="trunkSourceWebCoreloadercacheCachedSVGDocumentReferencecpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.cpp        2015-07-07 01:11:49 UTC (rev 186390)

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

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

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

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

</span><del>-    if (m_acceptsAnyImageType)

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

</del><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="trunkSourceWebCoreloadercacheCachedSVGDocumentReferenceh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/loader/cache/CachedSVGDocumentReference.h        2015-07-07 01:11:49 UTC (rev 186390)

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

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

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

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

</span><del>-    void setAcceptsAnyImageType() { m_acceptsAnyImageType = true; }

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

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

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

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

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

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

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

</span><del>-    bool m_acceptsAnyImageType { false };

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

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

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

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

<a id="trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp (186389 => 186390)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-07-07 01:05:48 UTC (rev 186389)

+++ trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-07-07 01:11:49 UTC (rev 186390)

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

</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);

<del>-        // 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();

-    }

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

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

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

</span><span class="lines">@@ -223,10 +219,9 @@

</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.

<del>-    // FIXME: This is silly.

</del><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>