<!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>[209914] 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/209914">209914</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-16 00:42:29 -0800 (Fri, 16 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>svg/as-image/svg-image-with-data-uri-use-data-uri.svg is flaky after <a href="http://trac.webkit.org/projects/webkit/changeset/207754">r207754</a>
https://bugs.webkit.org/show_bug.cgi?id=163887
<rdar://problem/29266436>
Patch by Youenn Fablet <youennf@gmail.com> on 2016-12-16
Reviewed by Alex Christensen.
Source/WebCore:
Test: http/tests/security/cross-origin-cached-images-with-memory-pressure.html
With the introduction of cached resource cloning, an Image may be referenced by several CachedImage.
This did not work well with Image observer system as it mandates a one-to-one relationship.
Introducing CachedImageObserver to restore the one-to-one relationship between Image and its observer.
CachedImageObserver can keep references for more than one CachedImage.
In the future, it might be better to split more clearly CachedImageObserver and its API from CachedImage.
Or remove the concept of CachedResource cloning and find new ways to provide CachedResource origin information to clients.
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::load): Moved boolean image observer fields to CachedImageObserver.
(WebCore::CachedImage::setBodyDataFrom): Keeping a reference of the image observer when cloning the resource.
(WebCore::CachedImage::createImage): Creating the observer when creating the image.
(WebCore::CachedImage::CachedImageObserver::CachedImageObserver):
(WebCore::CachedImage::CachedImageObserver::decodedSizeChanged):
(WebCore::CachedImage::CachedImageObserver::didDraw):
(WebCore::CachedImage::CachedImageObserver::animationAdvanced):
(WebCore::CachedImage::CachedImageObserver::changedInRect):
(WebCore::CachedImage::clearImage):
* loader/cache/CachedImage.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::setBodyDataFrom): Now that each cached image receives decodedSizeChanged callback, we need to set its size correctly.
LayoutTests:
* http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt: Added.
* http/tests/security/cross-origin-cached-images-with-memory-pressure.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="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincachedimageswithmemorypressureexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossorigincachedimageswithmemorypressurehtml">trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209913 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-16 07:12:23 UTC (rev 209913)
+++ trunk/LayoutTests/ChangeLog 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-16 Youenn Fablet <youennf@gmail.com>
+
+ svg/as-image/svg-image-with-data-uri-use-data-uri.svg is flaky after r207754
+ https://bugs.webkit.org/show_bug.cgi?id=163887
+ <rdar://problem/29266436>
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt: Added.
+ * http/tests/security/cross-origin-cached-images-with-memory-pressure.html: Added.
+
</ins><span class="cx"> 2016-12-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> text-align: justify and word-spacing combine to overflow column
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincachedimageswithmemorypressureexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt (0 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure-expected.txt 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Tests source origin difference for cached resources.
+
+This succeeds if not crashing after applying memory pressure (https://bugs.webkit.org/show_bug.cgi?id=163887).
+Test 1 PASS: Loaded img data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJMaWdodFNlYUdyZWVuIi8+PHJlY3QgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiLz48aW1hZ2UgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiB4bGluazpocmVmPSJkYXRhOmltYWdlL3N2Zyt4bWw7YmFzZTY0LFBITjJaeUI0Yld4dWN6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM5emRtY2lJSGh0Ykc1ek9uaHNhVzVyUFNKb2RIUncNCk9pOHZkM2QzTG5jekxtOXlaeTh4T1RrNUwzaHNhVzVySWo0OGNtVmpkQ0I0UFNJd0lpQjVQU0l3SWlCM2FXUjBhRDBpTVRBd0pTSWcNCmFHVnBaMmgwUFNJeE1EQWxJaUJtYVd4c1BTSm5jbVZsYmlJdlBqeHlaV04wSUhnOUlqSXdJaUI1UFNJeU1DSWdkMmxrZEdnOUlqRXcNCk1DVWlJR2hsYVdkb2REMGlNVEF3SlNJZ1ptbHNiRDBpY21Wa0lpOCtQR2x0WVdkbElIZzlJakl3SWlCNVBTSXlNQ0lnZDJsa2RHZzkNCklqRXdNQ1VpSUdobGFXZG9kRDBpTVRBd0pTSWdlR3hwYm1zNmFISmxaajBpWkdGMFlUcHBiV0ZuWlM5emRtY3JlRzFzTzJKaGMyVTINCk5DeFFTRTR5V25sQ05HSlhlSF
ZqZWpCcFlVaFNNR05FYjNaTU0yUXpaSGsxTTAxNU5YWmpiV04yVFdwQmQwMURPWHBrYldOcFNVaG8NCmRHSkhOWHBQYm1oellWYzFjbEJUU205a1NGSjNEUXBQYVRoMlpETmtNMHh1WTNwTWJUbDVXbms0ZUU5VWF6Vk1NMmh6WVZjMWNrbHENCk5EaGpiVlpxWkVOQ05GQlRTWGRKYVVJMVVGTkpkMGxwUWpOaFYxSXdZVVF3YVUxVVFYZEtVMGxuRFFwaFIxWndXakpvTUZCVFNYaE4NClJFRnNTV2xDYldGWGVITlFVMHB6WVZka2IyUkZaSGxhVjFaMVNXazRLMUJJU214Wk0xRm5aVVF3YVUxcVFXbEpTR3M1U1dwSmQwbHANClFqTmhWMUl3RFFwaFJEQnBUVlJCZDBwVFNXZGhSMVp3V2pKb01GQlRTWGhOUkVGc1NXbENiV0ZYZUhOUVUwcDVXbGRSYVV4Nk5EaGgNClZ6Rm9XakpWWjJWRU1HbE5ha0ZwU1Vock9VbHFTWGRKYVVJekRRcGhWMUl3WVVRd2FVMVVRWGRLVTBsbllVZFdjRm95YURCUVUwbDQNClRVUkJiRWxwUWpSaVIyeDFZWHB3YjJOdFZtMVFVMHByV1ZoU2FFOXRiSFJaVjJSc1RETk9NbHA1ZERSaVYzYzNEUXBaYlVaNldsUloNCk1FeEdRa2xVYWtwaFpWVkpNRmxzWkRSa1YwNDJUVWRzYUZOR1NYZFpNRkoyWkd0M2VscEVUbXRsVkZWNlZGaHJNV1J0VG5SWk0xcE8NCllXdEdNMVJWVFRWbGJWSjBEUXBaTW14S1UwZG9NRmxyWXpGbGF6bDFZVWhPYUZaNlZubFZSazVMWWpKU1NWVnVZMDVEYXpsd1QwaGENCmEwMHlVWHBVUnpWcVpXdDRkRTlZYkdGbFZHZzBWREZTY2s1VmQzcGhTRTVvRFFwV2VsWjVVMWR2TUU
5SFRuUldiWEJyVVRCSk1GVkcNClRrcGtNR3h3VVdwV1VWVXdiRE5UVjJ4RFRUSkdXRlZxUW1oU1JFSndWRlpTUW1Rd2NGUlRWMk5PUTIxR1NGWnVRbUZOYldkM0RRcFYNClJrNUtaVVV4UlZGWGVFcGhWVXAwV1Zaa05HTXhRbFJUYms1b1ZucEdjMVZxVGt0aVJuQllUa2RzVFdWcVVUUlpNakZYWVcxU1JGRnENClVsRlZNR3cxVkZWT1Nsb3lWbFZOUjJ4T0RRcGhhMFp3VTFWb2EyTkdjRWxWYlRoT1EyeENWRk5ZYUU1U1JVWnpVMWRzUTJJeGNGaGkNClJ6Vm9VMFpGTlZOWGNFWmtNREZFVmxkc1NsSXhjSGRaYTJRelQxVnNkVk50ZUdGUk1Hd3lEUXBWUjNBMFkwZEtXRkp0TldGVk1Fa3cNClZVWk9TbVZWTVVSVFYyUnNWa1JDY0ZSWGNFSmhWV3hKV2toQlRrTnNjRWxWYlRsUlZUQnNORlJWVWtKaVJXeHdVVzA1WVZZeWVIVloNClZXaFNEUXBQVld4eFVsaGtUbEV4Vm5CVFZXaHZZekpHV0U1WVNsQmlWMmcxVjJ4a1drOVZiSFJWYldoclVqQlZNbGxXWTNoaFJtOTUNClZsaGFhbEo2Vm5WVWVrcExZVWROZVZaVVNVNURhelZFRFFwbFNFSlhZVEJ3VVZaWE5XcGtNVTEzV2tjMWFVMUZXa05WVmxaSFZERlYNCmVGWnRPVk5XYkZwMVZWWldSMUZzU1hoU2EwcFNWbFZhUkZsVVFrOVJiR1JXVW10S1VsWlZiM3BVYTJoRERRcFdNVnBXVW10S1VsWlYNCldrTldNRlV4VmtaV2NWRnJiMDVEYkVaWlUyNXdUMUl3TUhsV1ZsWkhVV3hHVm1SRmRGUmlSWEJIVlcxNFYySkdVblZUYWtKT1VtdGENClIxWkhkRWRSYkVaV0RRcGlSRTVQ
VFVVMVJsZHRjRzVPVm05NVdYcEdVbUY2YTNwWmEyaEhXVlphUm1GR1VtbFhSa3AxVlZSQ2MySnMNClJsWlNiRTFPUTJ4S1ZsUnJTbEpOUlZwNVZsZDBSMkpzUmxoaVJYQmhEUXBOUlZwRFZsZDBWMUpHUmxaVWEwcG9UVlZ3UTFkcVFrZGoNClJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRFdWWldjMkpzUmxaU2JFNVRWbFUxUTFWVVFrZGpiRlp5RFFwU2JUUk8NClEyeEdXR0pGY0dGTlJWcERWbGQwVjFKR1JsWlVhMHBvVFZWd1ExZHFRa2RqUms1WVdrVktVbFpyY0VkVlZFSkhVa1pHV0dSR1RsSlcNCk1sSkRXVlpXYzJKc1JsWlNiRTVURFFwV1ZUVkRWVlJDUjJOc1ZuSlNiVFZTVmpKNFMxZHFRa2RSYkZaeVZtdFJUa05zUmxaVWEwcG8NClRWVndRMWRxUWtkalJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRERRcFpWbFp6WW14R1ZsSnNUbE5XVlRWRFZWUkMNClIyTnNWbkpTYlRWU1ZqSlNTMVZzVmtkU2JGWnlWbXRTVWxaVk5VTlpWRVpMVVcxU2RWTnRNRTVEYlU1elZXeEtWVkpYVW05Vk1GSlANCkRRcGxSbXh5VW10S1VsWlZXa05WVjNSM1ZURmFWVlpyV21waVdGSk1WMnBLYTJKc1FsVk5SMnhSWVc1a01sbFdZM2hoUm05NVZsTjANClVWRjZiRFphUnpGcVN6QlNVbUl3TlVSYWVqQTVEUXBKYWpRNFRESnNkRmxYWkd4UWFuZDJZek5hYmxCblBUMGlQand2YVcxaFoyVSsNClBDOXpkbWMrIj48L2ltYWdlPjwvc3ZnPg== from localhost:8000 (crossOrigin=anonymous)
+Test 2 PASS: Loaded img data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJMaWdodFNlYUdyZWVuIi8+PHJlY3QgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiLz48aW1hZ2UgeD0iMjAiIHk9IjIwIiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiB4bGluazpocmVmPSJkYXRhOmltYWdlL3N2Zyt4bWw7YmFzZTY0LFBITjJaeUI0Yld4dWN6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM5emRtY2lJSGh0Ykc1ek9uaHNhVzVyUFNKb2RIUncNCk9pOHZkM2QzTG5jekxtOXlaeTh4T1RrNUwzaHNhVzVySWo0OGNtVmpkQ0I0UFNJd0lpQjVQU0l3SWlCM2FXUjBhRDBpTVRBd0pTSWcNCmFHVnBaMmgwUFNJeE1EQWxJaUJtYVd4c1BTSm5jbVZsYmlJdlBqeHlaV04wSUhnOUlqSXdJaUI1UFNJeU1DSWdkMmxrZEdnOUlqRXcNCk1DVWlJR2hsYVdkb2REMGlNVEF3SlNJZ1ptbHNiRDBpY21Wa0lpOCtQR2x0WVdkbElIZzlJakl3SWlCNVBTSXlNQ0lnZDJsa2RHZzkNCklqRXdNQ1VpSUdobGFXZG9kRDBpTVRBd0pTSWdlR3hwYm1zNmFISmxaajBpWkdGMFlUcHBiV0ZuWlM5emRtY3JlRzFzTzJKaGMyVTINCk5DeFFTRTR5V25sQ05HSlhlSF
ZqZWpCcFlVaFNNR05FYjNaTU0yUXpaSGsxTTAxNU5YWmpiV04yVFdwQmQwMURPWHBrYldOcFNVaG8NCmRHSkhOWHBQYm1oellWYzFjbEJUU205a1NGSjNEUXBQYVRoMlpETmtNMHh1WTNwTWJUbDVXbms0ZUU5VWF6Vk1NMmh6WVZjMWNrbHENCk5EaGpiVlpxWkVOQ05GQlRTWGRKYVVJMVVGTkpkMGxwUWpOaFYxSXdZVVF3YVUxVVFYZEtVMGxuRFFwaFIxWndXakpvTUZCVFNYaE4NClJFRnNTV2xDYldGWGVITlFVMHB6WVZka2IyUkZaSGxhVjFaMVNXazRLMUJJU214Wk0xRm5aVVF3YVUxcVFXbEpTR3M1U1dwSmQwbHANClFqTmhWMUl3RFFwaFJEQnBUVlJCZDBwVFNXZGhSMVp3V2pKb01GQlRTWGhOUkVGc1NXbENiV0ZYZUhOUVUwcDVXbGRSYVV4Nk5EaGgNClZ6Rm9XakpWWjJWRU1HbE5ha0ZwU1Vock9VbHFTWGRKYVVJekRRcGhWMUl3WVVRd2FVMVVRWGRLVTBsbllVZFdjRm95YURCUVUwbDQNClRVUkJiRWxwUWpSaVIyeDFZWHB3YjJOdFZtMVFVMHByV1ZoU2FFOXRiSFJaVjJSc1RETk9NbHA1ZERSaVYzYzNEUXBaYlVaNldsUloNCk1FeEdRa2xVYWtwaFpWVkpNRmxzWkRSa1YwNDJUVWRzYUZOR1NYZFpNRkoyWkd0M2VscEVUbXRsVkZWNlZGaHJNV1J0VG5SWk0xcE8NCllXdEdNMVJWVFRWbGJWSjBEUXBaTW14S1UwZG9NRmxyWXpGbGF6bDFZVWhPYUZaNlZubFZSazVMWWpKU1NWVnVZMDVEYXpsd1QwaGENCmEwMHlVWHBVUnpWcVpXdDRkRTlZYkdGbFZHZzBWREZTY2s1VmQzcGhTRTVvRFFwV2VsWjVVMWR2TUU
5SFRuUldiWEJyVVRCSk1GVkcNClRrcGtNR3h3VVdwV1VWVXdiRE5UVjJ4RFRUSkdXRlZxUW1oU1JFSndWRlpTUW1Rd2NGUlRWMk5PUTIxR1NGWnVRbUZOYldkM0RRcFYNClJrNUtaVVV4UlZGWGVFcGhWVXAwV1Zaa05HTXhRbFJUYms1b1ZucEdjMVZxVGt0aVJuQllUa2RzVFdWcVVUUlpNakZYWVcxU1JGRnENClVsRlZNR3cxVkZWT1Nsb3lWbFZOUjJ4T0RRcGhhMFp3VTFWb2EyTkdjRWxWYlRoT1EyeENWRk5ZYUU1U1JVWnpVMWRzUTJJeGNGaGkNClJ6Vm9VMFpGTlZOWGNFWmtNREZFVmxkc1NsSXhjSGRaYTJRelQxVnNkVk50ZUdGUk1Hd3lEUXBWUjNBMFkwZEtXRkp0TldGVk1Fa3cNClZVWk9TbVZWTVVSVFYyUnNWa1JDY0ZSWGNFSmhWV3hKV2toQlRrTnNjRWxWYlRsUlZUQnNORlJWVWtKaVJXeHdVVzA1WVZZeWVIVloNClZXaFNEUXBQVld4eFVsaGtUbEV4Vm5CVFZXaHZZekpHV0U1WVNsQmlWMmcxVjJ4a1drOVZiSFJWYldoclVqQlZNbGxXWTNoaFJtOTUNClZsaGFhbEo2Vm5WVWVrcExZVWROZVZaVVNVNURhelZFRFFwbFNFSlhZVEJ3VVZaWE5XcGtNVTEzV2tjMWFVMUZXa05WVmxaSFZERlYNCmVGWnRPVk5XYkZwMVZWWldSMUZzU1hoU2EwcFNWbFZhUkZsVVFrOVJiR1JXVW10S1VsWlZiM3BVYTJoRERRcFdNVnBXVW10S1VsWlYNCldrTldNRlV4VmtaV2NWRnJiMDVEYkVaWlUyNXdUMUl3TUhsV1ZsWkhVV3hHVm1SRmRGUmlSWEJIVlcxNFYySkdVblZUYWtKT1VtdGENClIxWkhkRWRSYkVaV0RRcGlSRTVQ
VFVVMVJsZHRjRzVPVm05NVdYcEdVbUY2YTNwWmEyaEhXVlphUm1GR1VtbFhSa3AxVlZSQ2MySnMNClJsWlNiRTFPUTJ4S1ZsUnJTbEpOUlZwNVZsZDBSMkpzUmxoaVJYQmhEUXBOUlZwRFZsZDBWMUpHUmxaVWEwcG9UVlZ3UTFkcVFrZGoNClJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRFdWWldjMkpzUmxaU2JFNVRWbFUxUTFWVVFrZGpiRlp5RFFwU2JUUk8NClEyeEdXR0pGY0dGTlJWcERWbGQwVjFKR1JsWlVhMHBvVFZWd1ExZHFRa2RqUms1WVdrVktVbFpyY0VkVlZFSkhVa1pHV0dSR1RsSlcNCk1sSkRXVlpXYzJKc1JsWlNiRTVURFFwV1ZUVkRWVlJDUjJOc1ZuSlNiVFZTVmpKNFMxZHFRa2RSYkZaeVZtdFJUa05zUmxaVWEwcG8NClRWVndRMWRxUWtkalJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRERRcFpWbFp6WW14R1ZsSnNUbE5XVlRWRFZWUkMNClIyTnNWbkpTYlRWU1ZqSlNTMVZzVmtkU2JGWnlWbXRTVWxaVk5VTlpWRVpMVVcxU2RWTnRNRTVEYlU1elZXeEtWVkpYVW05Vk1GSlANCkRRcGxSbXh5VW10S1VsWlZXa05WVjNSM1ZURmFWVlpyV21waVdGSk1WMnBLYTJKc1FsVk5SMnhSWVc1a01sbFdZM2hoUm05NVZsTjANClVWRjZiRFphUnpGcVN6QlNVbUl3TlVSYWVqQTVEUXBKYWpRNFRESnNkRmxYWkd4UWFuZDJZek5hYmxCblBUMGlQand2YVcxaFoyVSsNClBDOXpkbWMrIj48L2ltYWdlPjwvc3ZnPg== from localhost:8080 (crossOrigin=anonymous)
+PASS applying memory pressure
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossorigincachedimageswithmemorypressurehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure.html (0 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-cached-images-with-memory-pressure.html 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+<html>
+<body>
+<p>Tests source origin difference for cached resources.</p
+<p>This succeeds if not crashing after applying memory pressure (https://bugs.webkit.org/show_bug.cgi?id=163887).</p>
+<div id="console"></div>
+<div>
+ <iframe id="iframe1"></iframe>
+ <iframe id="iframe2"></iframe>
+</div>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+window.addEventListener("message", function(event) {
+ document.getElementById('console').innerHTML += event.data + "<br/>";
+ loadNextFrame();
+});
+
+var iframeURL8000 = "http://localhost:8000/security/resources/cross-origin-cached-resource-iframe.html";
+var iframeURL8080 = "http://localhost:8080/security/resources/cross-origin-cached-resource-iframe.html";
+
+var allowAllImage1 = "data:image/svg+xml;base64, " +
+ "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRw" +
+ "Oi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48cmVjdCB4PSIwIiB5PSIwIiB3aWR0aD0iMTAwJSIg" +
+ "aGVpZ2h0PSIxMDAlIiBmaWxsPSJMaWdodFNlYUdyZWVuIi8+PHJlY3QgeD0iMjAiIHk9IjIwIiB3" +
+ "aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiLz48aW1hZ2UgeD0iMjAiIHk9IjIw" +
+ "IiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiB4bGluazpocmVmPSJkYXRhOmltYWdlL3N2Zyt4" +
+ "bWw7YmFzZTY0LFBITjJaeUI0Yld4dWN6MGlhSFIwY0RvdkwzZDNkeTUzTXk1dmNtY3ZNakF3TUM5" +
+ "emRtY2lJSGh0Ykc1ek9uaHNhVzVyUFNKb2RIUncNCk9pOHZkM2QzTG5jekxtOXlaeTh4T1RrNUwz" +
+ "aHNhVzVySWo0OGNtVmpkQ0I0UFNJd0lpQjVQU0l3SWlCM2FXUjBhRDBpTVRBd0pTSWcNCmFHVnBa" +
+ "MmgwUFNJeE1EQWxJaUJtYVd4c1BTSm5jbVZsYmlJdlBqeHlaV04wSUhnOUlqSXdJaUI1UFNJeU1D" +
+ "SWdkMmxrZEdnOUlqRXcNCk1DVWlJR2hsYVdkb2REMGlNVEF3SlNJZ1ptbHNiRDBpY21Wa0lpOCtQ" +
+ "R2x0WVdkbElIZzlJakl3SWlCNVBTSXlNQ0lnZDJsa2RHZzkNCklqRXdNQ1VpSUdobGFXZG9kRDBp" +
+ "TVRBd0pTSWdlR3hwYm1zNmFISmxaajBpWkdGMFlUcHBiV0ZuWlM5emRtY3JlRzFzTzJKaGMyVTIN" +
+ "Ck5DeFFTRTR5V25sQ05HSlhlSFZqZWpCcFlVaFNNR05FYjNaTU0yUXpaSGsxTTAxNU5YWmpiV04y" +
+ "VFdwQmQwMURPWHBrYldOcFNVaG8NCmRHSkhOWHBQYm1oellWYzFjbEJUU205a1NGSjNEUXBQYVRo" +
+ "MlpETmtNMHh1WTNwTWJUbDVXbms0ZUU5VWF6Vk1NMmh6WVZjMWNrbHENCk5EaGpiVlpxWkVOQ05G" +
+ "QlRTWGRKYVVJMVVGTkpkMGxwUWpOaFYxSXdZVVF3YVUxVVFYZEtVMGxuRFFwaFIxWndXakpvTUZC" +
+ "VFNYaE4NClJFRnNTV2xDYldGWGVITlFVMHB6WVZka2IyUkZaSGxhVjFaMVNXazRLMUJJU214Wk0x" +
+ "Rm5aVVF3YVUxcVFXbEpTR3M1U1dwSmQwbHANClFqTmhWMUl3RFFwaFJEQnBUVlJCZDBwVFNXZGhS" +
+ "MVp3V2pKb01GQlRTWGhOUkVGc1NXbENiV0ZYZUhOUVUwcDVXbGRSYVV4Nk5EaGgNClZ6Rm9XakpW" +
+ "WjJWRU1HbE5ha0ZwU1Vock9VbHFTWGRKYVVJekRRcGhWMUl3WVVRd2FVMVVRWGRLVTBsbllVZFdj" +
+ "Rm95YURCUVUwbDQNClRVUkJiRWxwUWpSaVIyeDFZWHB3YjJOdFZtMVFVMHByV1ZoU2FFOXRiSFJa" +
+ "VjJSc1RETk9NbHA1ZERSaVYzYzNEUXBaYlVaNldsUloNCk1FeEdRa2xVYWtwaFpWVkpNRmxzWkRS" +
+ "a1YwNDJUVWRzYUZOR1NYZFpNRkoyWkd0M2VscEVUbXRsVkZWNlZGaHJNV1J0VG5SWk0xcE8NCllX" +
+ "dEdNMVJWVFRWbGJWSjBEUXBaTW14S1UwZG9NRmxyWXpGbGF6bDFZVWhPYUZaNlZubFZSazVMWWpK" +
+ "U1NWVnVZMDVEYXpsd1QwaGENCmEwMHlVWHBVUnpWcVpXdDRkRTlZYkdGbFZHZzBWREZTY2s1VmQz" +
+ "cGhTRTVvRFFwV2VsWjVVMWR2TUU5SFRuUldiWEJyVVRCSk1GVkcNClRrcGtNR3h3VVdwV1VWVXdi" +
+ "RE5UVjJ4RFRUSkdXRlZxUW1oU1JFSndWRlpTUW1Rd2NGUlRWMk5PUTIxR1NGWnVRbUZOYldkM0RR" +
+ "cFYNClJrNUtaVVV4UlZGWGVFcGhWVXAwV1Zaa05HTXhRbFJUYms1b1ZucEdjMVZxVGt0aVJuQllU" +
+ "a2RzVFdWcVVUUlpNakZYWVcxU1JGRnENClVsRlZNR3cxVkZWT1Nsb3lWbFZOUjJ4T0RRcGhhMFp3" +
+ "VTFWb2EyTkdjRWxWYlRoT1EyeENWRk5ZYUU1U1JVWnpVMWRzUTJJeGNGaGkNClJ6Vm9VMFpGTlZO" +
+ "WGNFWmtNREZFVmxkc1NsSXhjSGRaYTJRelQxVnNkVk50ZUdGUk1Hd3lEUXBWUjNBMFkwZEtXRkp0" +
+ "TldGVk1Fa3cNClZVWk9TbVZWTVVSVFYyUnNWa1JDY0ZSWGNFSmhWV3hKV2toQlRrTnNjRWxWYlRs" +
+ "UlZUQnNORlJWVWtKaVJXeHdVVzA1WVZZeWVIVloNClZXaFNEUXBQVld4eFVsaGtUbEV4Vm5CVFZX" +
+ "aHZZekpHV0U1WVNsQmlWMmcxVjJ4a1drOVZiSFJWYldoclVqQlZNbGxXWTNoaFJtOTUNClZsaGFh" +
+ "bEo2Vm5WVWVrcExZVWROZVZaVVNVNURhelZFRFFwbFNFSlhZVEJ3VVZaWE5XcGtNVTEzV2tjMWFV" +
+ "MUZXa05WVmxaSFZERlYNCmVGWnRPVk5XYkZwMVZWWldSMUZzU1hoU2EwcFNWbFZhUkZsVVFrOVJi" +
+ "R1JXVW10S1VsWlZiM3BVYTJoRERRcFdNVnBXVW10S1VsWlYNCldrTldNRlV4VmtaV2NWRnJiMDVE" +
+ "YkVaWlUyNXdUMUl3TUhsV1ZsWkhVV3hHVm1SRmRGUmlSWEJIVlcxNFYySkdVblZUYWtKT1VtdGEN" +
+ "ClIxWkhkRWRSYkVaV0RRcGlSRTVQVFVVMVJsZHRjRzVPVm05NVdYcEdVbUY2YTNwWmEyaEhXVlph" +
+ "Um1GR1VtbFhSa3AxVlZSQ2MySnMNClJsWlNiRTFPUTJ4S1ZsUnJTbEpOUlZwNVZsZDBSMkpzUmxo" +
+ "aVJYQmhEUXBOUlZwRFZsZDBWMUpHUmxaVWEwcG9UVlZ3UTFkcVFrZGoNClJrNVlXa1ZLVWxacmNF" +
+ "ZFZWRUpIVWtaR1dHUkdUbEpXTWxKRFdWWldjMkpzUmxaU2JFNVRWbFUxUTFWVVFrZGpiRlp5RFFw" +
+ "U2JUUk8NClEyeEdXR0pGY0dGTlJWcERWbGQwVjFKR1JsWlVhMHBvVFZWd1ExZHFRa2RqUms1WVdr" +
+ "VktVbFpyY0VkVlZFSkhVa1pHV0dSR1RsSlcNCk1sSkRXVlpXYzJKc1JsWlNiRTVURFFwV1ZUVkRW" +
+ "VlJDUjJOc1ZuSlNiVFZTVmpKNFMxZHFRa2RSYkZaeVZtdFJUa05zUmxaVWEwcG8NClRWVndRMWRx" +
+ "UWtkalJrNVlXa1ZLVWxacmNFZFZWRUpIVWtaR1dHUkdUbEpXTWxKRERRcFpWbFp6WW14R1ZsSnNU" +
+ "bE5XVlRWRFZWUkMNClIyTnNWbkpTYlRWU1ZqSlNTMVZzVmtkU2JGWnlWbXRTVWxaVk5VTlpWRVpM" +
+ "VVcxU2RWTnRNRTVEYlU1elZXeEtWVkpYVW05Vk1GSlANCkRRcGxSbXh5VW10S1VsWlZXa05WVjNS" +
+ "M1ZURmFWVlpyV21waVdGSk1WMnBLYTJKc1FsVk5SMnhSWVc1a01sbFdZM2hoUm05NVZsTjANClVW" +
+ "RjZiRFphUnpGcVN6QlNVbUl3TlVSYWVqQTVEUXBKYWpRNFRESnNkRmxYWkd4UWFuZDJZek5hYmxC" +
+ "blBUMGlQand2YVcxaFoyVSsNClBDOXpkbWMrIj48L2ltYWdlPjwvc3ZnPg==";
+
+var counter = 0;
+function loadNextFrame()
+{
+ counter++;
+ // Four first tests try to load an image with a given origin and then the same image (in cache) with a different origin.
+ if (counter == 1)
+ document.getElementById('iframe1').src = iframeURL8000 + "#" +
+ encodeURIComponent(JSON.stringify({node: "img", url: allowAllImage1, shouldPass:true, crossOrigin: "anonymous", id: 1}));
+ else if (counter == 2)
+ document.getElementById('iframe2').src = iframeURL8080 + "#" +
+ encodeURIComponent(JSON.stringify({node: "img", url: allowAllImage1, shouldPass: true, crossOrigin: "anonymous", id: 2}));
+ else
+ endTest();
+}
+
+function endTest()
+{
+ // Removing iframe2 and applying memory pressure should kick in SVG CachedImage clearing of observer
+ document.getElementById('iframe2').src = "";
+ setTimeout(function() {
+ if (window.internals) {
+ internals.beginSimulatedMemoryPressure();
+ internals.endSimulatedMemoryPressure();
+ }
+ document.getElementById('console').innerHTML += "PASS applying memory pressure";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+}
+
+loadNextFrame();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209913 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-16 07:12:23 UTC (rev 209913)
+++ trunk/Source/WebCore/ChangeLog 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-12-16 Youenn Fablet <youennf@gmail.com>
+
+ svg/as-image/svg-image-with-data-uri-use-data-uri.svg is flaky after r207754
+ https://bugs.webkit.org/show_bug.cgi?id=163887
+ <rdar://problem/29266436>
+
+ Reviewed by Alex Christensen.
+
+ Test: http/tests/security/cross-origin-cached-images-with-memory-pressure.html
+
+ With the introduction of cached resource cloning, an Image may be referenced by several CachedImage.
+ This did not work well with Image observer system as it mandates a one-to-one relationship.
+
+ Introducing CachedImageObserver to restore the one-to-one relationship between Image and its observer.
+ CachedImageObserver can keep references for more than one CachedImage.
+
+ In the future, it might be better to split more clearly CachedImageObserver and its API from CachedImage.
+ Or remove the concept of CachedResource cloning and find new ways to provide CachedResource origin information to clients.
+
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::load): Moved boolean image observer fields to CachedImageObserver.
+ (WebCore::CachedImage::setBodyDataFrom): Keeping a reference of the image observer when cloning the resource.
+ (WebCore::CachedImage::createImage): Creating the observer when creating the image.
+ (WebCore::CachedImage::CachedImageObserver::CachedImageObserver):
+ (WebCore::CachedImage::CachedImageObserver::decodedSizeChanged):
+ (WebCore::CachedImage::CachedImageObserver::didDraw):
+ (WebCore::CachedImage::CachedImageObserver::animationAdvanced):
+ (WebCore::CachedImage::CachedImageObserver::changedInRect):
+ (WebCore::CachedImage::clearImage):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::setBodyDataFrom): Now that each cached image receives decodedSizeChanged callback, we need to set its size correctly.
+
</ins><span class="cx"> 2016-12-15 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix debug build break since r209873. Unreviewed.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (209913 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-12-16 07:12:23 UTC (rev 209913)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -89,13 +89,6 @@
</span><span class="cx"> CachedResource::load(loader);
</span><span class="cx"> else
</span><span class="cx"> setLoading(false);
</span><del>-
- if (m_loader) {
- m_allowSubsampling = m_loader->frameLoader()->frame().settings().imageSubsamplingEnabled();
- m_allowLargeImageAsyncDecoding = m_loader->frameLoader()->frame().settings().largeImageAsyncDecodingEnabled();
- m_allowAnimatedImageAsyncDecoding = m_loader->frameLoader()->frame().settings().animatedImageAsyncDecodingEnabled();
- m_showDebugBackground = m_loader->frameLoader()->frame().settings().showDebugBorders();
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedImage::setBodyDataFrom(const CachedResource& resource)
</span><span class="lines">@@ -106,6 +99,9 @@
</span><span class="cx"> CachedResource::setBodyDataFrom(resource);
</span><span class="cx">
</span><span class="cx"> m_image = image.m_image;
</span><ins>+ m_imageObserver = image.m_imageObserver;
+ if (m_imageObserver)
+ m_imageObserver->add(*this);
</ins><span class="cx">
</span><span class="cx"> if (m_image && is<SVGImage>(*m_image))
</span><span class="cx"> m_svgImageCache = std::make_unique<SVGImageCache>(&downcast<SVGImage>(*m_image));
</span><span class="lines">@@ -324,16 +320,18 @@
</span><span class="cx"> if (m_image)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_imageObserver = CachedImageObserver::create(*this);
+
+ if (m_response.mimeType() == "image/svg+xml") {
+ auto svgImage = SVGImage::create(*m_imageObserver, url());
+ m_svgImageCache = std::make_unique<SVGImageCache>(svgImage.ptr());
+ m_image = WTFMove(svgImage);
</ins><span class="cx"> #if USE(CG) && !USE(WEBKIT_IMAGE_DECODERS)
</span><del>- else if (m_response.mimeType() == "application/pdf")
- m_image = PDFDocumentImage::create(this);
</del><ins>+ } else if (m_response.mimeType() == "application/pdf") {
+ m_image = PDFDocumentImage::create(m_imageObserver.get());
</ins><span class="cx"> #endif
</span><del>- else if (m_response.mimeType() == "image/svg+xml") {
- auto svgImage = SVGImage::create(*this, url());
- m_svgImageCache = std::make_unique<SVGImageCache>(svgImage.ptr());
- m_image = WTFMove(svgImage);
</del><span class="cx"> } else
</span><del>- m_image = BitmapImage::create(this);
</del><ins>+ m_image = BitmapImage::create(m_imageObserver.get());
</ins><span class="cx">
</span><span class="cx"> if (m_image) {
</span><span class="cx"> // Send queued container size requests.
</span><span class="lines">@@ -345,12 +343,48 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CachedImage::CachedImageObserver::CachedImageObserver(CachedImage& image)
+{
+ m_cachedImages.reserveInitialCapacity(1);
+ m_cachedImages.append(&image);
+ if (auto* loader = image.loader()) {
+ m_allowSubsampling = loader->frameLoader()->frame().settings().imageSubsamplingEnabled();
+ m_allowLargeImageAsyncDecoding = loader->frameLoader()->frame().settings().largeImageAsyncDecodingEnabled();
+ m_allowAnimatedImageAsyncDecoding = loader->frameLoader()->frame().settings().animatedImageAsyncDecodingEnabled();
+ m_showDebugBackground = loader->frameLoader()->frame().settings().showDebugBorders();
+ }
+}
+
+void CachedImage::CachedImageObserver::decodedSizeChanged(const Image* image, long long delta)
+{
+ for (auto cachedImage : m_cachedImages)
+ cachedImage->decodedSizeChanged(image, delta);
+}
+
+void CachedImage::CachedImageObserver::didDraw(const Image* image)
+{
+ for (auto cachedImage : m_cachedImages)
+ cachedImage->didDraw(image);
+}
+
+void CachedImage::CachedImageObserver::animationAdvanced(const Image* image)
+{
+ for (auto cachedImage : m_cachedImages)
+ cachedImage->animationAdvanced(image);
+}
+
+void CachedImage::CachedImageObserver::changedInRect(const Image* image, const IntRect* rect)
+{
+ for (auto cachedImage : m_cachedImages)
+ cachedImage->changedInRect(image, rect);
+}
+
</ins><span class="cx"> inline void CachedImage::clearImage()
</span><span class="cx"> {
</span><del>- // If our Image has an observer, it's always us so we need to clear the back pointer
- // before dropping our reference.
- if (m_image)
- m_image->setImageObserver(nullptr);
</del><ins>+ if (m_imageObserver) {
+ m_imageObserver->remove(*this);
+ m_imageObserver = nullptr;
+ }
</ins><span class="cx"> m_image = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (209913 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2016-12-16 07:12:23 UTC (rev 209913)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> struct Length;
</span><span class="cx">
</span><del>-class CachedImage final : public CachedResource, public ImageObserver {
</del><ins>+class CachedImage final : public CachedResource {
</ins><span class="cx"> friend class MemoryCache;
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="lines">@@ -116,17 +116,43 @@
</span><span class="cx">
</span><span class="cx"> bool stillNeedsLoad() const override { return !errorOccurred() && status() == Unknown && !isLoading(); }
</span><span class="cx">
</span><del>- // ImageObserver
- bool allowSubsampling() const override { return m_allowSubsampling; }
- bool allowLargeImageAsyncDecoding() const override { return m_allowLargeImageAsyncDecoding; }
- bool allowAnimatedImageAsyncDecoding() const override { return m_allowAnimatedImageAsyncDecoding; }
- bool showDebugBackground() const override { return m_showDebugBackground; }
- void decodedSizeChanged(const Image*, long long delta) override;
- void didDraw(const Image*) override;
</del><ins>+ class CachedImageObserver final : public RefCounted<CachedImageObserver>, public ImageObserver {
+ public:
+ static Ref<CachedImageObserver> create(CachedImage& image) { return adoptRef(*new CachedImageObserver(image)); }
+ void add(CachedImage& image) { m_cachedImages.append(&image); }
+ void remove(CachedImage& image) { m_cachedImages.removeFirst(&image); }
</ins><span class="cx">
</span><del>- void animationAdvanced(const Image*) override;
- void changedInRect(const Image*, const IntRect* changeRect = nullptr) override;
</del><ins>+ private:
+ explicit CachedImageObserver(CachedImage&);
</ins><span class="cx">
</span><ins>+ // ImageObserver API
+ bool allowSubsampling() const final { return m_allowSubsampling; }
+ bool allowLargeImageAsyncDecoding() const override { return m_allowLargeImageAsyncDecoding; }
+ bool allowAnimatedImageAsyncDecoding() const override { return m_allowAnimatedImageAsyncDecoding; }
+ bool showDebugBackground() const final { return m_showDebugBackground; }
+ void decodedSizeChanged(const Image*, long long delta) final;
+ void didDraw(const Image*) final;
+
+ void animationAdvanced(const Image*) final;
+ void changedInRect(const Image*, const IntRect*) final;
+
+ Vector<CachedImage*> m_cachedImages;
+ // The default value of m_allowSubsampling should be the same as defaultImageSubsamplingEnabled in Settings.cpp
+#if PLATFORM(IOS)
+ bool m_allowSubsampling { true };
+#else
+ bool m_allowSubsampling { false };
+#endif
+ bool m_allowLargeImageAsyncDecoding { true };
+ bool m_allowAnimatedImageAsyncDecoding { true };
+ bool m_showDebugBackground { false };
+ };
+
+ void decodedSizeChanged(const Image*, long long delta);
+ void didDraw(const Image*);
+ void animationAdvanced(const Image*);
+ void changedInRect(const Image*, const IntRect*);
+
</ins><span class="cx"> void addIncrementalDataBuffer(SharedBuffer&);
</span><span class="cx">
</span><span class="cx"> void didReplaceSharedBufferContents() override;
</span><span class="lines">@@ -135,20 +161,11 @@
</span><span class="cx"> typedef HashMap<const CachedImageClient*, SizeAndZoom> ContainerSizeRequests;
</span><span class="cx"> ContainerSizeRequests m_pendingContainerSizeRequests;
</span><span class="cx">
</span><ins>+ RefPtr<CachedImageObserver> m_imageObserver;
</ins><span class="cx"> RefPtr<Image> m_image;
</span><span class="cx"> std::unique_ptr<SVGImageCache> m_svgImageCache;
</span><span class="cx"> bool m_isManuallyCached { false };
</span><span class="cx"> bool m_shouldPaintBrokenImage { true };
</span><del>-
- // The default value of m_allowSubsampling should be the same as defaultImageSubsamplingEnabled in Settings.cpp
-#if PLATFORM(IOS)
- bool m_allowSubsampling { true };
-#else
- bool m_allowSubsampling { false };
-#endif
- bool m_allowLargeImageAsyncDecoding { true };
- bool m_allowAnimatedImageAsyncDecoding { true };
- bool m_showDebugBackground { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (209913 => 209914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-12-16 07:12:23 UTC (rev 209913)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-12-16 08:42:29 UTC (rev 209914)
</span><span class="lines">@@ -297,6 +297,7 @@
</span><span class="cx"> void CachedResource::setBodyDataFrom(const CachedResource& resource)
</span><span class="cx"> {
</span><span class="cx"> m_data = resource.m_data;
</span><ins>+ setDecodedSize(resource.decodedSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::checkNotify()
</span></span></pre>
</div>
</div>
</body>
</html>