<!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>[186348] releases/WebKitGTK/webkit-2.8</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186348">186348</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-06 05:55:15 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/185093">r185093</a> - REGRESSION (179771): zooming on facebook images covers image
https://bugs.webkit.org/show_bug.cgi?id=145485
Reviewed by Simon Fraser.
Scaling an infinite rect should always produce an infinite rect.
(Based on Simon Fraser's patch)
Source/WebCore:
Test: compositing/layer-creation/zoomed-clip-intersection.html
* platform/graphics/LayoutRect.cpp:
(WebCore::LayoutRect::scale):
LayoutTests:
* compositing/layer-creation/zoomed-clip-intersection-expected.txt: Added.
* compositing/layer-creation/zoomed-clip-intersection.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsLayoutRectcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsLayoutRecth">releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositinglayercreationzoomedclipintersectionexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestscompositinglayercreationzoomedclipintersectionhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (186347 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-06 12:34:49 UTC (rev 186347)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-30 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (179771): zooming on facebook images covers image
+ https://bugs.webkit.org/show_bug.cgi?id=145485
+
+ Reviewed by Simon Fraser.
+
+ Scaling an infinite rect should always produce an infinite rect.
+ (Based on Simon Fraser's patch)
+
+ * compositing/layer-creation/zoomed-clip-intersection-expected.txt: Added.
+ * compositing/layer-creation/zoomed-clip-intersection.html: Added.
+
</ins><span class="cx"> 2015-05-29 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Text disappears shortly after page load on Nexus 7 site.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositinglayercreationzoomedclipintersectionexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection-expected.txt (0 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection-expected.txt 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+Image
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 2355.00 1755.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 585.00)
+ (contentsOpaque 1)
+ (transform [3.00 0.00 0.00 0.00] [0.00 3.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
+ (children 2
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 1024.00 1042.00)
+ )
+ (GraphicsLayer
+ (position 8.00 8.00)
+ (bounds 100.00 100.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestscompositinglayercreationzoomedclipintersectionhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection.html (0 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/compositing/layer-creation/zoomed-clip-intersection.html 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .underlay {
+ position: fixed;
+ width: 1024px;
+ height: 1042px;
+ background-color: rgba(0, 0, 0, 0.9);
+ }
+
+ .image {
+ position: relative;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function doTest()
+ {
+ if (window.eventSender)
+ eventSender.scalePageBy(3, 3);
+
+ if (window.internals)
+ window.internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+
+ if (window.testRunner)
+ document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <div class="underlay"></div>
+ <div class="image">Image</div>
+<pre id="layers"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186347 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 12:34:49 UTC (rev 186347)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-30 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (179771): zooming on facebook images covers image
+ https://bugs.webkit.org/show_bug.cgi?id=145485
+
+ Reviewed by Simon Fraser.
+
+ Scaling an infinite rect should always produce an infinite rect.
+ (Based on Simon Fraser's patch)
+
+ Test: compositing/layer-creation/zoomed-clip-intersection.html
+
+ * platform/graphics/LayoutRect.cpp:
+ (WebCore::LayoutRect::scale):
+
</ins><span class="cx"> 2015-06-01 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS JIT] Fail to compile when we are out of executable memory
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsLayoutRectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.cpp (186347 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.cpp 2015-07-06 12:34:49 UTC (rev 186347)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.cpp 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -104,14 +104,15 @@
</span><span class="cx"> m_size = newMaxPoint - newLocation;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LayoutRect::scale(float s)
</del><ins>+void LayoutRect::scale(float scaleValue)
</ins><span class="cx"> {
</span><del>- m_location.scale(s, s);
- m_size.scale(s);
</del><ins>+ scale(scaleValue, scaleValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LayoutRect::scale(float xScale, float yScale)
</span><span class="cx"> {
</span><ins>+ if (isInfinite())
+ return;
</ins><span class="cx"> m_location.scale(xScale, yScale);
</span><span class="cx"> m_size.scale(xScale, yScale);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.h (186347 => 186348)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.h 2015-07-06 12:34:49 UTC (rev 186347)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/LayoutRect.h 2015-07-06 12:55:15 UTC (rev 186348)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> m_size.setHeight(m_size.height() + dy + dy);
</span><span class="cx"> }
</span><span class="cx"> void inflate(LayoutUnit d) { inflateX(d); inflateY(d); }
</span><del>- WEBCORE_EXPORT void scale(float s);
</del><ins>+ WEBCORE_EXPORT void scale(float);
</ins><span class="cx"> void scale(float xScale, float yScale);
</span><span class="cx">
</span><span class="cx"> LayoutRect transposedRect() const { return LayoutRect(m_location.transposedPoint(), m_size.transposedSize()); }
</span></span></pre>
</div>
</div>
</body>
</html>