<!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>[184749] trunk</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/184749">184749</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 20:59:16 -0700 (Thu, 21 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>MaskImageOperation code does not manage CachedImageClients correctly
https://bugs.webkit.org/show_bug.cgi?id=145276
Source/WebCore:

rdar://problem/20959822

Reviewed by Andreas Kling.

Test: css3/masking/mask-image-client-crash.html

* platform/graphics/MaskImageOperation.cpp:
(WebCore::MaskImageOperation::isMaskLoaded):
(WebCore::MaskImageOperation::setImage):

    If image changes transfer the clients to the new image.

(WebCore::MaskImageOperation::setRenderLayerImageClient):

    Always use setImage.

(WebCore::MaskImageOperation::notifyFinished):
* platform/graphics/MaskImageOperation.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/RenderLayer.h:
* rendering/RenderLayerMaskImageInfo.cpp:
(WebCore::RenderLayer::MaskImageInfo::~MaskImageInfo):
(WebCore::RenderLayer::MaskImageInfo::updateMaskImageClients):

    Store the MaskImageOperations where we added clients.

(WebCore::RenderLayer::MaskImageInfo::removeMaskImageClients):

    Make sure we remove the clients from the same MaskImageOperations we added them to.

* rendering/RenderLayerMaskImageInfo.h:

LayoutTests:


Reviewed by Andreas Kling.

* css3/masking/mask-image-client-crash-expected.txt: Added.
* css3/masking/mask-image-client-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp">trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsMaskImageOperationh">trunk/Source/WebCore/platform/graphics/MaskImageOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerMaskImageInfoh">trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingmaskimageclientcrashexpectedtxt">trunk/LayoutTests/css3/masking/mask-image-client-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3maskingmaskimageclientcrashhtml">trunk/LayoutTests/css3/masking/mask-image-client-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/LayoutTests/ChangeLog        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-21  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        MaskImageOperation code does not manage CachedImageClients correctly
+        https://bugs.webkit.org/show_bug.cgi?id=145276
+
+        Reviewed by Andreas Kling.
+
+        * css3/masking/mask-image-client-crash-expected.txt: Added.
+        * css3/masking/mask-image-client-crash.html: Added.
+
</ins><span class="cx"> 2015-05-21  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update Autofill button icon
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskimageclientcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-image-client-crash-expected.txt (0 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-image-client-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-image-client-crash-expected.txt        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if it doesn't crash or assert. 
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingmaskimageclientcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/mask-image-client-crash.html (0 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/mask-image-client-crash.html                                (rev 0)
+++ trunk/LayoutTests/css3/masking/mask-image-client-crash.html        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html id=&quot;webtest0&quot;&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.dumpAsText();
+&lt;/script&gt;
+&lt;head id=&quot;webtest1&quot;&gt;
+&lt;link id=&quot;webtest2&quot; rel=&quot;stylesheet&quot; href=&quot;resources/svg_tests.css&quot;&gt;
+&lt;/head&gt;
+&lt;body&gt;
+This test passes if it doesn't crash or assert.
+&lt;a id=&quot;webtest4&quot; href=&quot;http://www.w3.org/html/wg/drafts/srcset/w3c-srcset&quot;&gt;&lt;/a&gt;
+&lt;br id=&quot;webtest12&quot; clear=&quot;all&quot;/&gt;
+&lt;/body&gt;
+
+&lt;script&gt;
+document.getElementById(&quot;webtest4&quot;).setAttribute(&quot;style&quot;,&quot;page-break-before:always;-webkit-mask-image:url(data:image/gif;base64,R0lGODdhAQACAPABAAD/AP///ywAAAAAAQACAAACAkQKADs=);&quot;);
+try {
+document.getElementById(&quot;webtest12&quot;).appendChild(document.createElement(&quot;applet&quot;)).setAttributeNodeNS(document.getElementById(&quot;webtest10&quot;));
+} catch(e) {
+}
+document.getElementById(&quot;webtest4&quot;).setAttribute(&quot;style&quot;,&quot;text-rendering:auto;&quot;);
+&lt;/script&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/ChangeLog        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-05-21  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        MaskImageOperation code does not manage CachedImageClients correctly
+        https://bugs.webkit.org/show_bug.cgi?id=145276
+        rdar://problem/20959822
+
+        Reviewed by Andreas Kling.
+
+        Test: css3/masking/mask-image-client-crash.html
+
+        * platform/graphics/MaskImageOperation.cpp:
+        (WebCore::MaskImageOperation::isMaskLoaded):
+        (WebCore::MaskImageOperation::setImage):
+
+            If image changes transfer the clients to the new image.
+
+        (WebCore::MaskImageOperation::setRenderLayerImageClient):
+
+            Always use setImage.
+
+        (WebCore::MaskImageOperation::notifyFinished):
+        * platform/graphics/MaskImageOperation.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        * rendering/RenderLayer.h:
+        * rendering/RenderLayerMaskImageInfo.cpp:
+        (WebCore::RenderLayer::MaskImageInfo::~MaskImageInfo):
+        (WebCore::RenderLayer::MaskImageInfo::updateMaskImageClients):
+
+            Store the MaskImageOperations where we added clients.
+
+        (WebCore::RenderLayer::MaskImageInfo::removeMaskImageClients):
+
+            Make sure we remove the clients from the same MaskImageOperations we added them to.
+
+        * rendering/RenderLayerMaskImageInfo.h:
+
</ins><span class="cx"> 2015-05-21  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update Autofill button icon
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMaskImageOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/platform/graphics/MaskImageOperation.cpp        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -129,6 +129,28 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void MaskImageOperation::setImage(PassRefPtr&lt;StyleImage&gt; image)
+{
+    if (m_styleImage == image)
+        return;
+
+    if (m_styleImage) {
+        if (m_renderLayerImageClient &amp;&amp; m_styleImage-&gt;cachedImage())
+            m_styleImage-&gt;cachedImage()-&gt;removeClient(m_renderLayerImageClient);
+        for (auto&amp; client : m_rendererImageClients)
+            m_styleImage-&gt;removeClient(client.key);
+    }
+
+    m_styleImage = image;
+
+    if (m_styleImage) {
+        if (m_renderLayerImageClient &amp;&amp; m_styleImage-&gt;cachedImage())
+            m_styleImage-&gt;cachedImage()-&gt;addClient(m_renderLayerImageClient);
+        for (auto&amp; client : m_rendererImageClients)
+            m_styleImage-&gt;addClient(client.key);
+    }
+}
+
</ins><span class="cx"> void MaskImageOperation::setRenderLayerImageClient(CachedImageClient* client)
</span><span class="cx"> {
</span><span class="cx">     if (m_renderLayerImageClient == client)
</span><span class="lines">@@ -205,11 +227,7 @@
</span><span class="cx">         ASSERT(cachedSVGDocument-&gt;loader());
</span><span class="cx">         if (SubresourceLoader* loader = cachedSVGDocument-&gt;loader()) {
</span><span class="cx">             if (SharedBuffer* dataBuffer = loader-&gt;resourceData()) {
</span><del>-                m_styleImage = StyleCachedImage::create(new CachedImage(cachedSVGDocument-&gt;resourceRequest(), cachedSVGDocument-&gt;sessionID()));
-                if (m_renderLayerImageClient)
-                    m_styleImage-&gt;cachedImage()-&gt;addClient(m_renderLayerImageClient);
-                for (auto itClient : m_rendererImageClients)
-                    m_styleImage-&gt;addClient(itClient.key);
</del><ins>+                setImage(StyleCachedImage::create(new CachedImage(cachedSVGDocument-&gt;resourceRequest(), cachedSVGDocument-&gt;sessionID())));
</ins><span class="cx"> 
</span><span class="cx">                 m_styleImage-&gt;cachedImage()-&gt;setResponse(cachedSVGDocument-&gt;response());
</span><span class="cx">                 m_styleImage-&gt;cachedImage()-&gt;finishLoading(dataBuffer);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsMaskImageOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/MaskImageOperation.h (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/MaskImageOperation.h        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/platform/graphics/MaskImageOperation.h        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">     const String&amp; fragment() const { return m_fragment; }
</span><span class="cx">     bool isExternalDocument() const { return m_isExternalDocument; }
</span><span class="cx">     StyleImage* image() const { return m_styleImage.get(); }
</span><del>-    void setImage(PassRefPtr&lt;StyleImage&gt; image) { m_styleImage = image; }
</del><ins>+    void setImage(PassRefPtr&lt;StyleImage&gt;);
</ins><span class="cx">     void setRenderLayerImageClient(CachedImageClient*);
</span><span class="cx">     void addRendererImageClient(RenderElement*);
</span><span class="cx">     void removeRendererImageClient(RenderElement*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -6708,7 +6708,7 @@
</span><span class="cx">     updateBlendMode();
</span><span class="cx"> #endif
</span><span class="cx">     updateOrRemoveFilterClients();
</span><del>-    updateOrRemoveMaskImageClients(oldStyle);
</del><ins>+    updateOrRemoveMaskImageClients();
</ins><span class="cx"> 
</span><span class="cx">     updateNeedsCompositedScrolling();
</span><span class="cx"> 
</span><span class="lines">@@ -6863,17 +6863,12 @@
</span><span class="cx">         filterInfo-&gt;removeReferenceFilterClients();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayer::updateOrRemoveMaskImageClients(const RenderStyle* oldStyle)
</del><ins>+void RenderLayer::updateOrRemoveMaskImageClients()
</ins><span class="cx"> {
</span><del>-    if (oldStyle &amp;&amp; oldStyle-&gt;maskImage().get()) {
-        if (MaskImageInfo* maskImageInfo = MaskImageInfo::getIfExists(*this))
-            maskImageInfo-&gt;removeMaskImageClients(*oldStyle);
-    }
-
</del><span class="cx">     if (renderer().style().maskImage().get())
</span><span class="cx">         MaskImageInfo::get(*this).updateMaskImageClients();
</span><span class="cx">     else if (MaskImageInfo* maskImageInfo = MaskImageInfo::getIfExists(*this))
</span><del>-        maskImageInfo-&gt;removeMaskImageClients(renderer().style());
</del><ins>+        maskImageInfo-&gt;removeMaskImageClients();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderLayer::updateOrRemoveFilterEffectRenderer()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/rendering/RenderLayer.h        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -920,9 +920,8 @@
</span><span class="cx"> 
</span><span class="cx">     void updateOrRemoveFilterClients();
</span><span class="cx">     void updateOrRemoveFilterEffectRenderer();
</span><ins>+    void updateOrRemoveMaskImageClients();
</ins><span class="cx"> 
</span><del>-    void updateOrRemoveMaskImageClients(const RenderStyle* oldStyle);
-
</del><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx">     void updateAncestorChainHasBlendingDescendants();
</span><span class="cx">     void dirtyAncestorChainHasBlendingDescendants();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.cpp        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -106,16 +106,18 @@
</span><span class="cx"> 
</span><span class="cx"> RenderLayer::MaskImageInfo::~MaskImageInfo()
</span><span class="cx"> {
</span><del>-    removeMaskImageClients(m_layer.renderer().style());
</del><ins>+    removeMaskImageClients();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderLayer::MaskImageInfo::updateMaskImageClients()
</span><span class="cx"> {
</span><del>-    removeMaskImageClients(m_layer.renderer().style());
</del><ins>+    removeMaskImageClients();
</ins><span class="cx">     
</span><span class="cx">     for (auto* maskLayer = m_layer.renderer().style().maskLayers(); maskLayer; maskLayer = maskLayer-&gt;next()) {
</span><del>-        const RefPtr&lt;MaskImageOperation&gt; maskImage = maskLayer-&gt;maskImage();
</del><ins>+        RefPtr&lt;MaskImageOperation&gt; maskImage = maskLayer-&gt;maskImage();
</ins><span class="cx">         maskImage-&gt;setRenderLayerImageClient(m_imageClient.get());
</span><ins>+        m_maskImageOperations.append(maskImage);
+
</ins><span class="cx">         CachedSVGDocumentReference* documentReference = maskImage-&gt;cachedSVGDocumentReference();
</span><span class="cx">         CachedSVGDocument* cachedSVGDocument = documentReference ? documentReference-&gt;document() : nullptr;
</span><span class="cx">         
</span><span class="lines">@@ -134,13 +136,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayer::MaskImageInfo::removeMaskImageClients(const RenderStyle&amp; oldStyle)
</del><ins>+void RenderLayer::MaskImageInfo::removeMaskImageClients()
</ins><span class="cx"> {
</span><del>-    for (auto* maskLayer = oldStyle.maskLayers(); maskLayer; maskLayer = maskLayer-&gt;next()) {
-        if (auto&amp; image = maskLayer-&gt;maskImage())
-            image-&gt;setRenderLayerImageClient(nullptr);
-    }
-    
</del><ins>+    for (auto&amp; maskImage : m_maskImageOperations)
+        maskImage-&gt;setRenderLayerImageClient(nullptr);
+
</ins><span class="cx">     for (auto&amp; externalSVGReference : m_externalSVGReferences)
</span><span class="cx">         externalSVGReference-&gt;removeClient(m_svgDocumentClient.get());
</span><span class="cx">     m_externalSVGReferences.clear();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerMaskImageInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h (184748 => 184749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h        2015-05-22 02:54:44 UTC (rev 184748)
+++ trunk/Source/WebCore/rendering/RenderLayerMaskImageInfo.h        2015-05-22 03:59:16 UTC (rev 184749)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">     ~MaskImageInfo();
</span><span class="cx"> 
</span><span class="cx">     void updateMaskImageClients();
</span><del>-    void removeMaskImageClients(const RenderStyle&amp; oldStyle);
</del><ins>+    void removeMaskImageClients();
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     static HashMap&lt;const RenderLayer*, std::unique_ptr&lt;MaskImageInfo&gt;&gt;&amp; layerToMaskMap();
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">     Vector&lt;CachedResourceHandle&lt;CachedSVGDocument&gt;&gt; m_externalSVGReferences;
</span><span class="cx">     std::unique_ptr&lt;SVGDocumentClient&gt; m_svgDocumentClient;
</span><span class="cx">     std::unique_ptr&lt;ImageClient&gt; m_imageClient;
</span><ins>+    Vector&lt;RefPtr&lt;MaskImageOperation&gt;&gt; m_maskImageOperations;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>