<!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>[198423] branches/safari-601.1.46-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/198423">198423</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 09:07:21 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/198372">r198372</a>. rdar://problem/25234912</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">branches/safari-601.1.46-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastcanvascrashwhileresizingcanvasexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcanvascrashwhileresizingcanvashtml">branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (198422 => 198423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 16:06:26 UTC (rev 198422)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 16:07:21 UTC (rev 198423)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r198372.
+
+ 2016-03-17 Zalan Bujtas <zalan@apple.com>
+
+ Don't initiate a style recall while drawing text
+ https://bugs.webkit.org/show_bug.cgi?id=155618
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we don't initiate a style recalc while in the middle of text drawing.
+
+ * fast/canvas/crash-while-resizing-canvas-expected.txt: Added.
+ * fast/canvas/crash-while-resizing-canvas.html: Added.
+
+2016-03-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r192770.
</span><span class="cx">
</span><span class="cx"> 2015-11-25 Pranjal Jumde <pjumde@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcanvascrashwhileresizingcanvasexpectedtxtfromrev198413branchessafari601branchLayoutTestsfastcanvascrashwhileresizingcanvasexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas-expected.txt (from rev 198413, branches/safari-601-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas-expected.txt) (0 => 198423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas-expected.txt 2016-03-18 16:07:21 UTC (rev 198423)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if no crash or assert.
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcanvascrashwhileresizingcanvashtmlfromrev198413branchessafari601branchLayoutTestsfastcanvascrashwhileresizingcanvashtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas.html (from rev 198413, branches/safari-601-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas.html) (0 => 198423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/canvas/crash-while-resizing-canvas.html 2016-03-18 16:07:21 UTC (rev 198423)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that changing the canvas size while executing fillText does not crash.</title>
+</head>
+<body>
+Pass if no crash or assert.
+<canvas id=ca></canvas>
+<textarea autofocus='below' onfocusin = 'changeCanvasWidth()'></textarea>
+<script>
+function changeCanvasWidth() {
+ for (var i = 0; i < 1000; ++i) {
+ c3 = document.getElementById("ca");
+ c3.width = i;
+ }
+}
+
+function fillText() {
+ c2 = document.getElementById("ca").getContext("2d");
+ c2.fillText("foobar", 100, 34);
+}
+
+document.write("<iframe onbeforeload='fillText()'></iframe>");
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198422 => 198423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 16:06:26 UTC (rev 198422)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 16:07:21 UTC (rev 198423)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r198372.
+
+ 2016-03-17 Zalan Bujtas <zalan@apple.com>
+
+ Don't initiate a style recall while drawing text
+ https://bugs.webkit.org/show_bug.cgi?id=155618
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that we don't initiate a style recalc while in the middle of text drawing.
+
+ Test: fast/canvas/crash-while-resizing-canvas.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawTextInternal):
+
+2016-03-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r198370.
</span><span class="cx">
</span><span class="cx"> 2016-03-17 Eric Carlson <eric.carlson@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (198422 => 198423)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-03-18 16:06:26 UTC (rev 198422)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-03-18 16:07:21 UTC (rev 198423)
</span><span class="lines">@@ -2322,6 +2322,9 @@
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::drawTextInternal(const String& text, float x, float y, bool fill, float maxWidth, bool useMaxWidth)
</span><span class="cx"> {
</span><ins>+ const auto& fontProxy = this->fontProxy();
+ const FontMetrics& fontMetrics = fontProxy.fontMetrics();
+
</ins><span class="cx"> GraphicsContext* c = drawingContext();
</span><span class="cx"> if (!c)
</span><span class="cx"> return;
</span><span class="lines">@@ -2341,16 +2344,12 @@
</span><span class="cx"> if (fill && gradient && gradient->isZeroSize())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const auto& fontProxy = this->fontProxy();
- const FontMetrics& fontMetrics = fontProxy.fontMetrics();
-
</del><span class="cx"> String normalizedText = text;
</span><span class="cx"> normalizeSpaces(normalizedText);
</span><span class="cx">
</span><span class="cx"> // FIXME: Need to turn off font smoothing.
</span><span class="cx">
</span><span class="cx"> RenderStyle* computedStyle;
</span><del>- canvas()->document().updateStyleIfNeeded();
</del><span class="cx"> TextDirection direction = toTextDirection(state().direction, &computedStyle);
</span><span class="cx"> bool isRTL = direction == RTL;
</span><span class="cx"> bool override = computedStyle ? isOverride(computedStyle->unicodeBidi()) : false;
</span></span></pre>
</div>
</div>
</body>
</html>