<!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>[208715] 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/208715">208715</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-14 16:19:24 -0800 (Mon, 14 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208691">r208691</a>. rdar://problem/29250304</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsinspectorlayerslayerscompositingreasonsexpectedtxt">branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsinspectorlayerslayerscompositingreasonshtml">branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</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 (208714 => 208715)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-11-15 00:19:20 UTC (rev 208714)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-11-15 00:19:24 UTC (rev 208715)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-14 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208691. rdar://problem/29250304
+
+ 2016-11-14 David Kilzer <ddkilzer@apple.com>
+
+ Bug 164702: WebContent crash due to checked unsigned overflow in WebCore: WebCore::RenderLayerCompositor::requiresCompositingLayer const + 1104
+ <https://webkit.org/b/164702>
+ <rdar://problem/29236368>
+
+ Reviewed by Darin Adler.
+
+ * inspector/layers/layers-compositing-reasons-expected.txt:
+ Update results.
+ * inspector/layers/layers-compositing-reasons.html: Update to
+ reproduce the crash. This does not reproduce the original crash
+ stack, but does exercise the same crashing code.
+
</ins><span class="cx"> 2016-11-09 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Land test expectations for rdar://problem/29169239.
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsinspectorlayerslayerscompositingreasonsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons-expected.txt (208714 => 208715)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons-expected.txt 2016-11-15 00:19:20 UTC (rev 208714)
+++ branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons-expected.txt 2016-11-15 00:19:24 UTC (rev 208715)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+
</ins><span class="cx"> === Enable the LayerTree agent ===
</span><span class="cx">
</span><span class="cx"> PASS
</span><span class="lines">@@ -15,4 +15,5 @@
</span><span class="cx">
</span><span class="cx"> PASS: <div id="opacity-container"> is composited due to having an opacity style and a composited child.
</span><span class="cx"> PASS: <div id="child"> is composited due to having "backface-visibility: hidden" and a 3D transform.
</span><ins>+PASS: <canvas id="canvas"> is composited due to having a 3D transform.
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsinspectorlayerslayerscompositingreasonshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons.html (208714 => 208715)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons.html 2016-11-15 00:19:20 UTC (rev 208714)
+++ branches/safari-602-branch/LayoutTests/inspector/layers/layers-compositing-reasons.html 2016-11-15 00:19:24 UTC (rev 208715)
</span><span class="lines">@@ -73,6 +73,11 @@
</span><span class="cx"> "<div id=\"child\"> is composited due to having \"backface-visibility: hidden\" and a 3D transform",
</span><span class="cx"> compositingReasons.transform3D && compositingReasons.backfaceVisibilityHidden,
</span><span class="cx"> true);
</span><ins>+ } else if (hasId(node, "canvas")) {
+ assert(
+ "<canvas id=\"canvas\"> is composited due to having a 3D transform",
+ compositingReasons.transform3D,
+ true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (++count === layers.length)
</span><span class="lines">@@ -152,6 +157,10 @@
</span><span class="cx"> -webkit-transform: translateZ(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ #canvas {
+ transform: translate3D(0,0,0);
+ }
+
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="lines">@@ -162,5 +171,7 @@
</span><span class="cx"> <div id="child"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+ <canvas id="canvas" width="65537" height="65537"></canvas>
+
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208714 => 208715)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-15 00:19:20 UTC (rev 208714)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-15 00:19:24 UTC (rev 208715)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-11-14 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208691. rdar://problem/29250304
+
+ 2016-11-14 David Kilzer <ddkilzer@apple.com>
+
+ Bug 164702: WebContent crash due to checked unsigned overflow in WebCore: WebCore::RenderLayerCompositor::requiresCompositingLayer const + 1104
+ <https://webkit.org/b/164702>
+ <rdar://problem/29236368>
+
+ Reviewed by Darin Adler.
+
+ Test: inspector/layers/layers-compositing-reasons.html
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForCanvas):
+ Don't composite if the canvas area overflows.
+
+2016-11-14 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208655. rdar://problem/29250302
</span><span class="cx">
</span><span class="cx"> 2016-11-12 Wenson Hsieh <wenson_hsieh@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (208714 => 208715)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-11-15 00:19:20 UTC (rev 208714)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-11-15 00:19:24 UTC (rev 208715)
</span><span class="lines">@@ -2543,7 +2543,8 @@
</span><span class="cx"> bool isCanvasLargeEnoughToForceCompositing = true;
</span><span class="cx"> #else
</span><span class="cx"> HTMLCanvasElement* canvas = downcast<HTMLCanvasElement>(renderer.element());
</span><del>- bool isCanvasLargeEnoughToForceCompositing = canvas->size().area().unsafeGet() >= canvasAreaThresholdRequiringCompositing;
</del><ins>+ auto canvasArea = canvas->size().area<RecordOverflow>();
+ bool isCanvasLargeEnoughToForceCompositing = !canvasArea.hasOverflowed() && canvasArea.unsafeGet() >= canvasAreaThresholdRequiringCompositing;
</ins><span class="cx"> #endif
</span><span class="cx"> CanvasCompositingStrategy compositingStrategy = canvasCompositingStrategy(renderer);
</span><span class="cx"> return compositingStrategy == CanvasAsLayerContents || (compositingStrategy == CanvasPaintedToLayer && isCanvasLargeEnoughToForceCompositing);
</span></span></pre>
</div>
</div>
</body>
</html>