<!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>[203577] branches/safari-602-branch</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/203577">203577</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-22 02:26:05 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203543">r203543</a>. rdar://problem/27429465</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreplatformgraphicscgImageBufferCGcpp">branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsfasthidpipdfimagescaledexpectedhtml">branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsfasthidpipdfimagescaledhtml">branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled.html</a></li>
<li><a href="#branchessafari602branchLayoutTestsfasthidpiresourcescirclepdf">branches/safari-602-branch/LayoutTests/fast/hidpi/resources/circle.pdf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (203576 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-22 09:26:02 UTC (rev 203576)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203543. rdar://problem/27429465
+
+ 2016-07-21 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r202927): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=159981
+ <rdar://problem/27429465>
+
+ Reviewed by Myles Maxfield.
+
+ * fast/hidpi/pdf-image-scaled-expected.html: Added.
+ * fast/hidpi/pdf-image-scaled.html: Added.
+ * fast/hidpi/resources/circle.pdf: Added.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203538. rdar://problem/27462960
</span><span class="cx">
</span><span class="cx"> 2016-07-21 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsfasthidpipdfimagescaledexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html (0 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled-expected.html 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+body {
+ overflow: hidden;
+}
+img {
+ width: 800px;
+ height: 800px;
+ zoom: 0.2;
+ transform: translate(0);
+}
+</style>
+<img src="resources/circle.pdf">
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfasthidpipdfimagescaledhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled.html (0 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/hidpi/pdf-image-scaled.html 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<style>
+body {
+ overflow: hidden;
+}
+img {
+ width: 800px;
+ height: 800px;
+ transform-origin: 0 0;
+ transform: scale(0.2);
+}
+</style>
+<img src="resources/circle.pdf">
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsfasthidpiresourcescirclepdf"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/fast/hidpi/resources/circle.pdf (0 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/fast/hidpi/resources/circle.pdf (rev 0)
+++ branches/safari-602-branch/LayoutTests/fast/hidpi/resources/circle.pdf 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -0,0 +1,629 @@
</span><ins>+%PDF-1.5+%\xE2\xE3\xCF\xD3
+1 0 obj+<</Metadata 2 0 R/Pages 3 0 R/Type/Catalog>>+endobj+2 0 obj+<</Length 41156/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c132 79.159284, 2016/04/19-13:13:40 ">
+ <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <rdf:Description rdf:about=""
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+ xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+ xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+ xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
+ xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+ xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/"
+ xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+ xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+ xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"
+ xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+ <dc:format>application/pdf</dc:format>
+ <dc:title>
+ <rdf:Alt>
+ <rdf:li xml:lang="x-default">circle</rdf:li>
+ </rdf:Alt>
+ </dc:title>
+ <xmp:MetadataDate>2016-07-20T12:12:04+10:00</xmp:MetadataDate>
+ <xmp:ModifyDate>2016-07-20T12:12:04+10:00</xmp:ModifyDate>
+ <xmp:CreateDate>2016-07-20T12:12:04+10:00</xmp:CreateDate>
+ <xmp:CreatorTool>Adobe Illustrator CC 2015.3 (Macintosh)</xmp:CreatorTool>
+ <xmp:Thumbnails>
+ <rdf:Alt>
+ <rdf:li rdf:parseType="Resource">
+ <xmpGImg:width>256</xmpGImg:width>
+ <xmpGImg:height>256</xmpGImg:height>
+ <xmpGImg:format>JPEG</xmpGImg:format>
+ <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucn
Z6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FUm8y+cvKnle1F15h1a10uEglPrMqoz06iNCebn2UHFXjHmr/nMz8u9NLxaBY3mvTLXjJQW&#xA;du3+zlDS/wDJLFXlHmH/AJzM/M2/Zk0iz0/R4T9hlja5mHzeVvTP/IvFXn+r/nz+cWqkm682agnL&#xA;qLSQWY616WwhxVit75n8y3zcr3Vr26Y9TNcSyHpT9pj2xVLMVdiqZ2XmfzLYtystWvbVh0MNxLGe&#xA;lP2WHbFWVaR+fP5xaUQbXzZqD8egu5BeDrXpcibFXoHl7/nMz8zbBlTV7PT9YhH22aNraY/J4m9M&#xA;f8i8Ver+Vf8AnMz8u9SKRa/Y3mgzNTlJQXluv+ziCy/8ksVez+WvOXlTzRam68vata6pCAC/1aVX&#xA;ZK9BIgPND7MBiqc4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FWC/mN+dX5f+QIGGt6&#xA;gJNRpWLSbWkt21RUVSoEYP8ANIVGKvl/8wP+cvfP2utJa+Wo08t6cagSR0mvHXp8UzDinj8Cgj+Y&#xA;4q8O1DUtR1K8kvdRupr28mNZbm4kaWVz4s7lmP0nFUNirsVdirsVdirsVdirsVdirsVROn6lqOm3&#xA;kd7p11NZXkJrFc28jRSofFXQqw+g4q9x/L//AJy98/aE0dr5ljTzJpwoDJJSG8RenwzKOL+PxqSf&#xA;5hir6g/Ln86vy/8AP8CjRNQEeo0rLpN1SK7WgqaJUiQD+aMsMVZ1irsVdirsVdirsVdirsVdirsV&#xA;dirsVdirsVS/X/MOieXtKn1bW72Kw062XlNczNxUeAHdmPQKNydhir5K/Nr/AJy81vVmm
0nyGr6T&#xA;pu6Pq8gH1yUdKxLuIFPju/f4Ttir50uLi4uZ5Li4leaeVi8ssjF3ZjuWZjUknFVPFXYq7FXYq7FX&#xA;Yq7FXYq7FXYq7FXYq7FXYqqW9xcW08dxbyvDPEweKWNijqw3DKwoQRir6L/KX/nLzW9JaHSfPivq&#xA;2m7ImrxgfXIh0rKuwnUeOz9/iO2KvrXQPMOieYdKg1bRL2K/065XlDcwtyU+IPdWHQqdwdjiqYYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYqwj81Pzd8q/lxo313V5PWv5w36O0qJh69ww+/hGD9pyKD3NBir4V&#xA;/Mz82PN35h6ub7XLjjaxsfqWmQki2t16fCpO7U6u25+W2KsMxV2KuxV2KuxV2KuxV2KuxV2KuxV2&#xA;KuxV2KuxV2KuxV2Ksz/LP82PN35eauL7Q7jlayMPrumTEm2uF6fEoOzU6Ou4+W2Kvur8q/zd8q/m&#xA;Po313SJPRv4Av6R0qVh69ux+7nGT9lwKH2NRirN8VdirsVdirsVdirsVdirsVebfnZ+dmi/lnoqO&#xA;6LfeYL5W/RmmcqVpsZpiN1iU/Sx2Hcqq+C/NXmvXvNWuXOua7dveajdNV5G6Kv7KIvREXoqjYYql&#xA;GKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVN/KvmvXvKuuW2uaFdvZ6jatVJF&#xA;6Mv7SOvR0boynY4q+9PyT/OzRfzM0V3RFsfMFiq/pPTOVaV2E0JO7RMfpU7HsWVek4q7FXYq7FXY&#xA;q7FXYqwj83fzU0b8uPKsmr3tJ7+blFpWncqNcT0+8RpUF27D3IGKvz581+atc81a9d67rly11qN4&#xA;/KRz9lR+yiL+yiDZVHQYqlGKuxV2KuxV2KuxV2
KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;VN/KnmrXPKuvWmu6Hcta6jZvyjcfZYftI6/tI42ZT1GKv0G/KL81NG/MfyrHq9lSC/h4xarp3KrW&#xA;89PvMb0JRu49wRirN8VdirsVdirsVS/zDr+leXtEvdb1adbbTrCJprmZuyr2A7sx2UDcnYYq/O78&#xA;2PzM1f8AMPzdca5fFo7Vaw6ZZV+G3tgSVXbbkftOe59qYqwzFXYq7FXYq7FXYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqzP8p/zM1f8vPN1vrliWktWpDqdlX4bi2JBZd9uQ+0h7H2&#xA;rir9EfL2v6V5h0Sy1vSZ1udOv4lmtpl7q3YjsynZgdwdjiqYYq7FXYq7FXx1/wA5efm02ra2vkPS&#xA;Zv8AcbpLiTV3Q7S3lPhiNOqwA7/5Z33UYq+cMVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdir6P/AOcQ/wA2m0nW28h6tN/uN1ZzJpDudorynxRCvRZwNv8ALG27&#xA;HFX2LirsVdirBfzq/MaDyB+X+oa2GH6RkH1XSYjQ8ruUHgaHqIwDI3suKvzpuLie5uJbi4kaWeZ2&#xA;kllc1Znc1ZmJ6kk4qp4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FVS3uJ7a4iuLeRop4XWSKVDRldDVWUjoQRir9FvyV/MaDz/APl/p+tlh+kYx9V1aIUHG7iA&#xA;5mg6CQESL7NirOsVdir4l/5y9/MBtd8/R+WrWSuneW09OQA/C95MA0zbfyLxTfoQ3jirwXFXYq7F&#xA;XYq7FXY
q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq96/5xC/MBtC8/&#xA;SeWrqSmneZE9OME/Cl5CC0Lb/wA68k26kr4Yq+2sVSbzl5ltfK/lTVvMN0AYdLtZbngTTmyKSkYP&#xA;i70UfPFX5m6lqF5qWo3Wo3shmvL2aS4uZT1eWVi7sfmzE4qhsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdiqJ03ULzTdRtdRspDDeWU0dxbSjqksTB0YfJ&#xA;lBxV+mXk3zLa+aPKmk+YbUAQ6paxXPAGvBnUF4yfFHqp+WKvGP8AnMzzUdN/Lux0CJ+M2vXg9Ra/&#xA;at7MCV/+SrRYq+K8VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdir7U/wCcM/NR1L8u77QJX5TaDeH01r9m3vAZU/5KrLiryj/nMzzC1/8AmbZ6QjVh&#xA;0fT41ZPCa5ZpXP0x+nirwLFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq99/5wz8wtYfmbeaQ7Uh1jT5FVPGa2ZZUP0R+pirz/wDPnVzqv5xebLon&#xA;lw1CS0B36WYFsOv/ABhxVgWKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;V2KuxV2KuxV2KuxV2KuxVnv5DaudK/OLyndA8eeoR2hO/S8Btj0/4zYqxXzPetfeZdWvW3a6vbiY&#xA;nbrJKzdtu+KpZirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs
VdirsVdirsVdirs&#xA;VdirsVdirsVTPyxetY+ZdJvV2a1vbeYHbrHKrd9u2KpZirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVTPzPZNY+ZdWsm2a1vbiEjbrHK&#xA;y9tu2KpZirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVTPyxZNfeZdJsl3a6vbeEDbrJKq99u+Ksq/PnSDpX5xebLUjjz1CS7A36XgFyOv/GbFWBYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FWe/k&#xA;NpB1X84vKdqBy4ahHdkb9LMG5PT/AIw4q9A/5zM8vNYfmbZ6ui0h1jT42Z/Ga2ZonH0R+nirwLFX&#xA;Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq99/5&#xA;wz8vNf8A5m3mrutYdH0+RlfwmuWWJB9MfqYq9X/5zM8qnUvy7sdfiTlNoN4PUan2be8Aif8A5KrF&#xA;ir4rxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV&#xA;2KvtT/nDPyqdN/Lu+1+VOM2vXh9Nqfat7MGJP+SrS4q9n85eWrXzR5U1by9dECHVLWW25kV4M6kJ&#xA;IB4o9GHyxV+ZupafeabqN1p17GYbyy
mkt7mI9UliYo6n5MpGKobFXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqidN0+81LUbXTrKMzXl7NHb20Q6vLKwRF&#xA;HzZgMVfpl5N8tWvlfyppPl61IMOl2sVtzApzZFAeQjxd6sfniqc4q+Jf+cvfy/bQvP0fmW1jpp3m&#xA;RPUkIHwpeQgLMu3868X36kt4Yq8FxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2&#xA;KuxV2KuxV2KuxV2KuxV2Kvev+cQvy/bXfP0nmW6jrp3ltPUjJHwveTArCu/8i8n26EL44q+2sVdi&#xA;rBfzq/LmDz/+X+oaIFH6RjH1rSZTQcbuIHgKnoJATG3s2KvzpuLee2uJbe4jaKeF2jlicUZXQ0ZW&#xA;B6EEYqp4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVS3t5&#xA;7m4it7eNpZ5nWOKJBVmdzRVUDqSTir9FvyV/LmDyB+X+n6IVH6RkH1rVpRQ8ruUDmKjqIwBGvsuK&#xA;s6xV2KuxV8df85eflK2k62vnzSYf9xurOI9XRBtFeU+GU06LOBv/AJY33YYq+cMVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir6P/5xD/KVtW1tvPmrQ/7jdJcx&#xA;6QjjaW8p8Uor1WAHb/LO26nFX2LirsVdirsVS/zDoGleYdEvdE1aBbnTr+JobmFu6t3B7Mp3UjcH&#xA;cYq/O782Pyz1f8vPN1xod8GktWrNpl7T4bi2JIVttuQ+y47H2pirDMVdirsVdirsVdirsVdirsVd&#xA
;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirM/yn/LPV/zD83W+h2IaO1Wk2p3tPht7YEBm325H&#xA;7KDufauKv0R8vaBpXl7RLLRNJgW206wiWG2hXsq9ye7Md2J3J3OKphirsVdirsVdirCPzd/KvRvz&#xA;H8qyaRe0gv4eUulajxq1vPT7zG9AHXuPcA4q/PnzX5V1zyrr13oWuWzWuo2b8ZEP2WH7Lo37SON1&#xA;YdRiqUYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FU38qeVdc81a9aaFo&#xA;ds11qN4/GNB9lR+07t+yiDdmPQYq/Qb8ovyr0b8uPKsekWVJ7+bjLquo8aNcT0+8RpUhF7D3JOKs&#xA;3xV2KuxV2KuxV2KuxV5t+dn5J6L+Zmiojutj5gsVb9GanxrSu5hmA3aJj9Kncdwyr4L81eVNe8q6&#xA;5c6Hrto9nqNq1Hjboy/sujdHRuqsNjiqUYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FU38q+VNe81a5baHoVo95qN01EjXoq/tO7dERerMdhir70/JP8AJPRfyz0V0R1vvMF8q/pP&#xA;U+NK03EMIO6xKfpY7nsFVek4q7FXYq7FXYq7FXYq7FXYqwj81Pyi8q/mPo31LV4/Rv4A36O1WJR6&#xA;9ux+7nGT9pCaH2NDir4V/Mz8p/N35eaubHXLflayMfqWpwgm2uF6/CxGzU6o24+W+KsMxV2KuxV2&#xA;KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ksz/LP8p/N35h6uLHQ7fjaxsPrupzAi2t16/EwG7U&#xA;6Iu5+W+Kvur8q/yi8q/lxo31LSI/Wv5wv6R1WVR69ww+/hGD9lAaD
3NTirN8VdirsVdirsVdirsV&#xA;dirsVdirsVS/X/L2ieYdKn0nW7KK/wBOuV4zW0y8lPgR3Vh1DDcHcYq+Svza/wCcQ9b0lptW8hs+&#xA;rabu76RIR9ciHWkTbCdR4bP2+I74q+dLi3uLaeS3uInhniYpLFIpR1YbFWU0IIxVTxV2KuxV2Kux&#xA;V2KuxV2KuxV2KuxV2KuxV2Kqlvb3FzPHb28TzTysEiijUu7MdgqqKkk4q+i/yl/5xD1vVmh1bz4z&#xA;6TpuzppEZH1yUdaStuIFPhu/b4Tvir610Dy9onl7SoNJ0SyisNOtl4w20K8VHiT3Zj1LHcnc4qmG&#xA;KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVgv5jfkr+X/AJ/gY63p4j1GlItWtaRXa0FBV6ESAfyy&#xA;Bhir5f8AzA/5xC8/aE0l15akTzJpwqRHHSG8RevxQseL+HwMSf5Rirw7UNN1HTbySy1G1msryE0l&#xA;triNopUPgyOFYfSMVQ2KuxV2KuxV2KuxV2KuxV2KuxVE6fpuo6leR2WnWs17eTGkVtbxtLK58FRA&#xA;zH6Bir3H8v8A/nELz9rrR3XmWRPLenGhMclJrx16/DCp4p4fGwI/lOKvqD8ufyV/L/yBAp0TTxJq&#xA;NKS6tdUlu2qKGj0AjB/ljCjFWdYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUm8y+T&#xA;fKnmi1Fr5h0m11SEAhPrMSuyV6mNyOaH3UjFXjHmr/nDP8u9SLy6BfXmgzNXjHUXluv+wlKy/wDJ&#xA;XFXlHmH/AJwz/M2wZn0i80/WIR9hVka2mPzSVfTH/IzFXn+r/kN+cWlEi68p6g/HqbSMXg6062xm&#xA;xVit75Y8y2Lcb3Sb21YdRN
byxnpX9pR2xVLMVdiqZ2XljzLfNxstJvbpj0ENvLIelf2VPbFWVaR+&#xA;Q35xaqQLXynqCcuhu4xZjrTrcmHFXoHl7/nDP8zb9lfV7zT9HhP21aRrmYfJIl9M/wDIzFXq/lX/&#xA;AJwz/LvTSkuv315r0y05R1Fnbt/sIi0v/JXFXs/lryb5U8r2ptfL2k2ulwkAP9WiVGenQyOBzc+7&#xA;E4qnOKuxV2KuxV2KuxV2KuxV2KuxV//Z</xmpGImg:image>
+ </rdf:li>
+ </rdf:Alt>
+ </xmp:Thumbnails>
+ <xmpMM:InstanceID>uuid:30172e8d-aac1-714b-818b-868511f3c96c</xmpMM:InstanceID>
+ <xmpMM:DocumentID>xmp.did:ab1ed911-fcfa-401d-8ac8-bc492eedca98</xmpMM:DocumentID>
+ <xmpMM:OriginalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</xmpMM:OriginalDocumentID>
+ <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+ <xmpMM:DerivedFrom rdf:parseType="Resource">
+ <stRef:instanceID>uuid:d1c078a0-2746-42b2-b0d1-25aedff8fb1e</stRef:instanceID>
+ <stRef:documentID>xmp.did:1b6690ed-28a8-c141-9479-b6a9cf6be651</stRef:documentID>
+ <stRef:originalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</stRef:originalDocumentID>
+ <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+ </xmpMM:DerivedFrom>
+ <xmpMM:History>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <stEvt:action>saved</stEvt:action>
+ <stEvt:instanceID>xmp.iid:ab1ed911-fcfa-401d-8ac8-bc492eedca98</stEvt:instanceID>
+ <stEvt:when>2016-07-20T12:11:26+10:00</stEvt:when>
+ <stEvt:softwareAgent>Adobe Illustrator CC 2015.3 (Macintosh)</stEvt:softwareAgent>
+ <stEvt:changed>/</stEvt:changed>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpMM:History>
+ <illustrator:StartupProfile>Print</illustrator:StartupProfile>
+ <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+ <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+ <xmpTPg:NPages>1</xmpTPg:NPages>
+ <xmpTPg:MaxPageSize rdf:parseType="Resource">
+ <stDim:w>400.000000</stDim:w>
+ <stDim:h>400.000000</stDim:h>
+ <stDim:unit>Pixels</stDim:unit>
+ </xmpTPg:MaxPageSize>
+ <xmpTPg:PlateNames>
+ <rdf:Seq>
+ <rdf:li>Cyan</rdf:li>
+ <rdf:li>Magenta</rdf:li>
+ <rdf:li>Yellow</rdf:li>
+ <rdf:li>Black</rdf:li>
+ </rdf:Seq>
+ </xmpTPg:PlateNames>
+ <xmpTPg:SwatchGroups>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+ <xmpG:groupType>0</xmpG:groupType>
+ <xmpG:Colorants>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>White</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>255</xmpG:red>
+ <xmpG:green>255</xmpG:green>
+ <xmpG:blue>255</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>Black</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>25</xmpG:red>
+ <xmpG:green>24</xmpG:green>
+ <xmpG:blue>24</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Red</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>165</xmpG:red>
+ <xmpG:green>69</xmpG:green>
+ <xmpG:blue>37</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Yellow</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>235</xmpG:red>
+ <xmpG:green>238</xmpG:green>
+ <xmpG:blue>75</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Green</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>62</xmpG:red>
+ <xmpG:green>136</xmpG:green>
+ <xmpG:blue>76</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Cyan</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>89</xmpG:red>
+ <xmpG:green>147</xmpG:green>
+ <xmpG:blue>224</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Blue</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>56</xmpG:red>
+ <xmpG:green>41</xmpG:green>
+ <xmpG:blue>119</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>CMYK Magenta</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>170</xmpG:red>
+ <xmpG:green>67</xmpG:green>
+ <xmpG:blue>116</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=15 M=100 Y=90 K=10</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>126</xmpG:red>
+ <xmpG:green>55</xmpG:green>
+ <xmpG:blue>38</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=90 Y=85 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>170</xmpG:red>
+ <xmpG:green>83</xmpG:green>
+ <xmpG:blue>50</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=80 Y=95 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>174</xmpG:red>
+ <xmpG:green>98</xmpG:green>
+ <xmpG:blue>46</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=50 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>191</xmpG:red>
+ <xmpG:green>142</xmpG:green>
+ <xmpG:blue>54</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=35 Y=85 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>203</xmpG:red>
+ <xmpG:green>169</xmpG:green>
+ <xmpG:blue>75</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=5 M=0 Y=90 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>223</xmpG:red>
+ <xmpG:green>231</xmpG:green>
+ <xmpG:blue>87</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=20 M=0 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>193</xmpG:red>
+ <xmpG:green>211</xmpG:green>
+ <xmpG:blue>76</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=50 M=0 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>139</xmpG:red>
+ <xmpG:green>178</xmpG:green>
+ <xmpG:blue>76</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=75 M=0 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>99</xmpG:red>
+ <xmpG:green>155</xmpG:green>
+ <xmpG:blue>76</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=85 M=10 Y=100 K=10</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>72</xmpG:red>
+ <xmpG:green>120</xmpG:green>
+ <xmpG:blue>65</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=90 M=30 Y=95 K=30</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>48</xmpG:red>
+ <xmpG:green>79</xmpG:green>
+ <xmpG:blue>49</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=75 M=0 Y=75 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>102</xmpG:red>
+ <xmpG:green>156</xmpG:green>
+ <xmpG:blue>105</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=80 M=10 Y=45 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>95</xmpG:red>
+ <xmpG:green>142</xmpG:green>
+ <xmpG:blue>140</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=70 M=15 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>118</xmpG:red>
+ <xmpG:green>148</xmpG:green>
+ <xmpG:blue>209</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=85 M=50 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>84</xmpG:red>
+ <xmpG:green>96</xmpG:green>
+ <xmpG:blue>165</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=100 M=95 Y=5 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>56</xmpG:red>
+ <xmpG:green>46</xmpG:green>
+ <xmpG:blue>117</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=100 M=100 Y=25 K=25</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>38</xmpG:red>
+ <xmpG:green>29</xmpG:green>
+ <xmpG:blue>74</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=75 M=100 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>78</xmpG:red>
+ <xmpG:green>45</xmpG:green>
+ <xmpG:blue>118</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=50 M=100 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>103</xmpG:red>
+ <xmpG:green>50</xmpG:green>
+ <xmpG:blue>117</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=35 M=100 Y=35 K=10</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>105</xmpG:red>
+ <xmpG:green>48</xmpG:green>
+ <xmpG:blue>77</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=10 M=100 Y=50 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>151</xmpG:red>
+ <xmpG:green>63</xmpG:green>
+ <xmpG:blue>73</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=95 Y=20 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>171</xmpG:red>
+ <xmpG:green>75</xmpG:green>
+ <xmpG:blue>101</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=25 M=25 Y=40 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>171</xmpG:red>
+ <xmpG:green>167</xmpG:green>
+ <xmpG:blue>142</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=40 M=45 Y=50 K=5</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>125</xmpG:red>
+ <xmpG:green>116</xmpG:green>
+ <xmpG:blue>104</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=50 M=50 Y=60 K=25</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>88</xmpG:red>
+ <xmpG:green>84</xmpG:green>
+ <xmpG:blue>72</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=55 M=60 Y=65 K=40</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>64</xmpG:red>
+ <xmpG:green>59</xmpG:green>
+ <xmpG:blue>52</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=25 M=40 Y=65 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>157</xmpG:red>
+ <xmpG:green>140</xmpG:green>
+ <xmpG:blue>97</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=30 M=50 Y=75 K=10</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>127</xmpG:red>
+ <xmpG:green>109</xmpG:green>
+ <xmpG:blue>71</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=35 M=60 Y=80 K=25</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>98</xmpG:red>
+ <xmpG:green>80</xmpG:green>
+ <xmpG:blue>51</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=40 M=65 Y=90 K=35</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>79</xmpG:red>
+ <xmpG:green>64</xmpG:green>
+ <xmpG:blue>37</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=40 M=70 Y=100 K=50</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>61</xmpG:red>
+ <xmpG:green>47</xmpG:green>
+ <xmpG:blue>22</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=50 M=70 Y=80 K=70</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>37</xmpG:red>
+ <xmpG:green>29</xmpG:green>
+ <xmpG:blue>19</xmpG:blue>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpG:Colorants>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Grays</xmpG:groupName>
+ <xmpG:groupType>1</xmpG:groupType>
+ <xmpG:Colorants>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=100</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>25</xmpG:red>
+ <xmpG:green>24</xmpG:green>
+ <xmpG:blue>24</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=90</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>50</xmpG:red>
+ <xmpG:green>49</xmpG:green>
+ <xmpG:blue>50</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=80</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>71</xmpG:red>
+ <xmpG:green>71</xmpG:green>
+ <xmpG:blue>73</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=70</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>91</xmpG:red>
+ <xmpG:green>91</xmpG:green>
+ <xmpG:blue>93</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=60</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>110</xmpG:red>
+ <xmpG:green>111</xmpG:green>
+ <xmpG:blue>113</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=50</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>130</xmpG:red>
+ <xmpG:green>131</xmpG:green>
+ <xmpG:blue>134</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=40</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>152</xmpG:red>
+ <xmpG:green>153</xmpG:green>
+ <xmpG:blue>155</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=30</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>175</xmpG:red>
+ <xmpG:green>176</xmpG:green>
+ <xmpG:blue>178</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=20</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>200</xmpG:red>
+ <xmpG:green>200</xmpG:green>
+ <xmpG:blue>202</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=10</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>225</xmpG:red>
+ <xmpG:green>225</xmpG:green>
+ <xmpG:blue>226</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=0 Y=0 K=5</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>238</xmpG:red>
+ <xmpG:green>238</xmpG:green>
+ <xmpG:blue>239</xmpG:blue>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpG:Colorants>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:groupName>Brights</xmpG:groupName>
+ <xmpG:groupType>1</xmpG:groupType>
+ <xmpG:Colorants>
+ <rdf:Seq>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=100 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>165</xmpG:red>
+ <xmpG:green>69</xmpG:green>
+ <xmpG:blue>37</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=75 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>176</xmpG:red>
+ <xmpG:green>105</xmpG:green>
+ <xmpG:blue>45</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=0 M=10 Y=95 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>224</xmpG:red>
+ <xmpG:green>215</xmpG:green>
+ <xmpG:blue>75</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=85 M=10 Y=100 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>80</xmpG:red>
+ <xmpG:green>134</xmpG:green>
+ <xmpG:blue>72</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=100 M=90 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>58</xmpG:red>
+ <xmpG:green>51</xmpG:green>
+ <xmpG:blue>127</xmpG:blue>
+ </rdf:li>
+ <rdf:li rdf:parseType="Resource">
+ <xmpG:swatchName>C=60 M=90 Y=0 K=0</xmpG:swatchName>
+ <xmpG:mode>RGB</xmpG:mode>
+ <xmpG:type>PROCESS</xmpG:type>
+ <xmpG:red>96</xmpG:red>
+ <xmpG:green>60</xmpG:green>
+ <xmpG:blue>126</xmpG:blue>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpG:Colorants>
+ </rdf:li>
+ </rdf:Seq>
+ </xmpTPg:SwatchGroups>
+ <pdf:Producer>Adobe PDF library 15.00</pdf:Producer>
+ </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<?xpacket end="w"?>+endstream+endobj+3 0 obj+<</Count 1/Kids[5 0 R]/Type/Pages>>+endobj+5 0 obj+<</ArtBox[50.0 50.0 350.0 350.0]/BleedBox[0.0 0.0 400.0 400.0]/Contents 6 0 R/MediaBox[0.0 0.0 400.0 400.0]/Parent 3 0 R/Resources<</ExtGState<</GS0 7 0 R>>/Properties<</MC0 8 0 R>>>>/TrimBox[0.0 0.0 400.0 400.0]/Type/Page>>+endobj+6 0 obj+<</Filter/FlateDecode/Length 143>>stream
+H\x89L\x8F\xB1\x82@ \x86\xF7>\xC5\xFF\xE5zw ̢q\x91\x8188\x82L\x9ApL\xBE\xBD\xD7\xE3@\xD3\xF4O\xFB\xE7k\x9B\x9A\xEB\xE33\x98\xAE O-h&A)k\xB2J\xE9\x8Ewt5\xC2D\xE6rL Ͱɲ\xF0\x95\xC0Erx%J\x95W4\xA5 \xEA\xC2V5\xD8F\xE6'\xB1\xF3\x99H\xA6\x97\xBFm\xA3\xC5fn\xFC\xBE#\xEF\xC9\xB4\xDB\xE1u\xFCI=\x9D\xBB\xF8RO_ ~,\xED+endstream+endobj+8 0 obj+<</Color[20224 32768 65535]/Dimmed false/Editable true/Preview true/Printed true/Title(Layer 1)/Visible true>>+endobj+7 0 obj+<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>+endobj+9 0 obj+<</CreationDate(D:20160720121204+10'00')/Creator(Adobe Illustrator CC 2015.3 \(Macintosh\))/ModDate(D:20160720121204+10'00')/Producer(Adobe PDF library 15.00)/Title(circle)>>+endobj+xref+0 10+0000000000 65535 f
+0000000016 00000 n
+0000000076 00000 n
+0000041309 00000 n
+0000000000 00000 f
+0000041360 00000 n
+0000041600 00000 n
+0000041937 00000 n
+0000041811 00000 n
+0000042049 00000 n
+trailer+<</Size 10/Root 1 0 R/Info 9 0 R/ID[<EAA2EA2D5125470487505616DBC63D30><5DDB73A029634015B02569BACBA2410B>]>>+startxref+42239+%%EOF
</ins></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203576 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:26:02 UTC (rev 203576)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203543. rdar://problem/27429465
+
+ 2016-07-21 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r202927): The internal size of the ImageBuffer is scaled twice by the context scaleFactor
+ https://bugs.webkit.org/show_bug.cgi?id=159981
+ <rdar://problem/27429465>
+
+ Reviewed by Myles Maxfield.
+
+ The change to propagate color spaces through ImageBuffers created an
+ alternate version of createCompatibleBuffer. This version accidentally
+ attempted to take the display resolution (i.e. hidpi) into account
+ when creating the buffer, which meant it was being applied twice.
+
+ The fix is simply to remove that logic. The caller of the method
+ will take the resolution into account, the same way they did
+ with the old createCompatibleBuffer method.
+
+ Test: fast/hidpi/pdf-image-scaled.html
+
+ * platform/graphics/cg/ImageBufferCG.cpp:
+ (WebCore::ImageBuffer::createCompatibleBuffer): Don't calculate
+ a resolution - just use the value of 1.0.
+
+2016-07-22 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203538. rdar://problem/27462960
</span><span class="cx">
</span><span class="cx"> 2016-07-21 Nan Wang <n_wang@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreplatformgraphicscgImageBufferCGcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (203576 => 203577)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 09:26:02 UTC (rev 203576)
+++ branches/safari-602-branch/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2016-07-22 09:26:05 UTC (rev 203577)
</span><span class="lines">@@ -75,8 +75,6 @@
</span><span class="cx"> if (size.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
- float resolutionScale = context.scaleFactor().width();
</del><span class="cx"> RetainPtr<CGColorSpaceRef> colorSpace;
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> CGContextRef cgContext = context.platformContext();
</span><span class="lines">@@ -99,8 +97,9 @@
</span><span class="cx"> colorSpace = sRGBColorSpaceRef();
</span><span class="cx"> #endif
</span><span class="cx"> RenderingMode renderingMode = context.renderingMode();
</span><ins>+ IntSize scaledSize = ImageBuffer::compatibleBufferSize(size, context);
</ins><span class="cx"> bool success = false;
</span><del>- std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(scaledSize, resolutionScale, colorSpace.get(), renderingMode, success));
</del><ins>+ std::unique_ptr<ImageBuffer> buffer(new ImageBuffer(scaledSize, 1, colorSpace.get(), renderingMode, success));
</ins><span class="cx">
</span><span class="cx"> if (!success)
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>