[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [132838] branches/chromium/1271
From: cevans () google ! com
Date: 2012-10-29 19:29:12
Message-ID: 20121029192912.B4837301211 () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[132838] branches/chromium/1271</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/132838">132838</a></dd> \
<dt>Author</dt> <dd>cevans@google.com</dd> <dt>Date</dt> <dd>2012-10-29 12:29:12 \
-0700 (Mon, 29 Oct 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>Merge 132724
BUG=157363
Review URL: https://codereview.chromium.org/11340016</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium1271SourceWebCoresvgSVGAnimationElementcpp">branches/chromium/1271/Source/WebCore/svg/SVGAnimationElement.cpp</a></li>
<li><a href="#brancheschromium1271SourceWebCoresvganimationSMILTimeh">branches/chromium/1271/Source/WebCore/svg/animation/SMILTime.h</a></li>
<li><a href="#brancheschromium1271SourceWebCoresvganimationSVGSMILElementcpp">branches/chromium/1271/Source/WebCore/svg/animation/SVGSMILElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#brancheschromium1271LayoutTestssvgcustomelementTimeControlnancrashexpect \
edtxt">branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash-expected.txt</a></li>
<li><a href="#brancheschromium1271LayoutTestssvgcustomelementTimeControlnancrashhtml" \
>branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash.html</a></li>
>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium1271LayoutTestssvgcustomelementTimeControlnancrashexpectedtxtfromrev132724trunkLayoutTestssvgcustomelementTimeControlnancrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash-expected.txt \
(from rev 132724, trunk/LayoutTests/svg/custom/elementTimeControl-nan-crash-expected.txt) \
(0 => 132838)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash-expected.txt \
(rev 0)
+++ branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash-expected.txt 2012-10-29 \
19:29:12 UTC (rev 132838) </span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test for WK100322: ElementTimeControl should check for invalid values. \
This test passes if it does not crash. </ins></span></pre></div>
<a id="brancheschromium1271LayoutTestssvgcustomelementTimeControlnancrashhtmlfromrev132724trunkLayoutTestssvgcustomelementTimeControlnancrashhtml"></a>
<div class="copfile"><h4>Copied: \
branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash.html (from \
rev 132724, trunk/LayoutTests/svg/custom/elementTimeControl-nan-crash.html) (0 => \
132838)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash.html \
(rev 0)
+++ branches/chromium/1271/LayoutTests/svg/custom/elementTimeControl-nan-crash.html 2012-10-29 \
19:29:12 UTC (rev 132838) </span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+ function crash() {
+ var animate = document.getElementById('animate');
+ var svg = document.getElementById('svg');
+ animate.endElementAt(NaN);
+ animate.beginElementAt(NaN);
+ svg.setCurrentTime(2);
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ }
+</script>
+</head>
+<body onload="crash()">
+Test for WK100322: ElementTimeControl should check for invalid values. This test \
passes if it does not crash. +
+<svg id="svg" width="200" height="200">
+ <rect x="0" y="0" width="100" \
height="100" fill="green"> + <animate \
id="animate" attributeName="x" to="200" \
begin="3s"/> + </rect>
+</svg>
+</body>
+</html>
</ins></span></pre></div>
<a id="brancheschromium1271SourceWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1271/Source/WebCore/svg/SVGAnimationElement.cpp (132837 => \
132838)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1271/Source/WebCore/svg/SVGAnimationElement.cpp 2012-10-29 19:22:49 \
UTC (rev 132837)
+++ branches/chromium/1271/Source/WebCore/svg/SVGAnimationElement.cpp 2012-10-29 \
19:29:12 UTC (rev 132838) </span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SVGParserUtilities.h"
</span><span class="cx"> #include "SVGStyledElement.h"
</span><ins>+#include <wtf/MathExtras.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -240,6 +241,8 @@
</span><span class="cx">
</span><span class="cx"> void SVGAnimationElement::beginElementAt(float offset)
</span><span class="cx"> {
</span><ins>+ if (isnan(offset))
+ return;
</ins><span class="cx"> SMILTime elapsed = this->elapsed();
</span><span class="cx"> addBeginTime(elapsed, elapsed + offset, \
SMILTimeWithOrigin::ScriptOrigin); </span><span class="cx"> }
</span><span class="lines">@@ -251,6 +254,8 @@
</span><span class="cx">
</span><span class="cx"> void SVGAnimationElement::endElementAt(float offset)
</span><span class="cx"> {
</span><ins>+ if (isnan(offset))
+ return;
</ins><span class="cx"> SMILTime elapsed = this->elapsed();
</span><span class="cx"> addEndTime(elapsed, elapsed + offset, \
SMILTimeWithOrigin::ScriptOrigin); </span><span class="cx"> }
</span></span></pre></div>
<a id="brancheschromium1271SourceWebCoresvganimationSMILTimeh"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1271/Source/WebCore/svg/animation/SMILTime.h (132837 => \
132838)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1271/Source/WebCore/svg/animation/SMILTime.h 2012-10-29 19:22:49 \
UTC (rev 132837)
+++ branches/chromium/1271/Source/WebCore/svg/animation/SMILTime.h 2012-10-29 \
19:29:12 UTC (rev 132838) </span><span class="lines">@@ -29,13 +29,14 @@
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx">
</span><span class="cx"> #include <algorithm>
</span><ins>+#include <wtf/MathExtras.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class SMILTime {
</span><span class="cx"> public:
</span><span class="cx"> SMILTime() : m_time(0) { }
</span><del>- SMILTime(double time) : m_time(time) { }
</del><ins>+ SMILTime(double time) : m_time(time) { ASSERT(!isnan(time)); }
</ins><span class="cx"> SMILTime(const SMILTime& o) : m_time(o.m_time) { }
</span><span class="cx">
</span><span class="cx"> static SMILTime unresolved() { return unresolvedValue; }
</span></span></pre></div>
<a id="brancheschromium1271SourceWebCoresvganimationSVGSMILElementcpp"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/1271/Source/WebCore/svg/animation/SVGSMILElement.cpp (132837 => \
132838)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/1271/Source/WebCore/svg/animation/SVGSMILElement.cpp 2012-10-29 \
19:22:49 UTC (rev 132837)
+++ branches/chromium/1271/Source/WebCore/svg/animation/SVGSMILElement.cpp 2012-10-29 \
19:29:12 UTC (rev 132838) </span><span class="lines">@@ -713,6 +713,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGSMILElement::addBeginTime(SMILTime eventTime, \
SMILTime beginTime, SMILTimeWithOrigin::Origin origin) </span><span class="cx"> {
</span><ins>+ ASSERT(!isnan(beginTime.value()));
</ins><span class="cx"> m_beginTimes.append(SMILTimeWithOrigin(beginTime, \
origin)); </span><span class="cx"> sortTimeList(m_beginTimes);
</span><span class="cx"> beginListChanged(eventTime);
</span><span class="lines">@@ -720,6 +721,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGSMILElement::addEndTime(SMILTime eventTime, SMILTime \
endTime, SMILTimeWithOrigin::Origin origin) </span><span class="cx"> {
</span><ins>+ ASSERT(!isnan(endTime.value()));
</ins><span class="cx"> m_endTimes.append(SMILTimeWithOrigin(endTime, origin));
</span><span class="cx"> sortTimeList(m_endTimes);
</span><span class="cx"> endListChanged(eventTime);
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic