<!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>[175955] releases/WebKitGTK/webkit-2.6/Source</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/175955">175955</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-11 10:15:46 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175655">r175655</a> - Assertion hit DOMTimer::updateTimerIntervalIfNecessary()
https://bugs.webkit.org/show_bug.cgi?id=138440
Reviewed by Geoffrey Garen.
Source/WebCore:
We sometimes hit the ASSERT(repeatInterval() == previousInterval)
assertion in DOMTimer::updateTimerIntervalIfNecessary() when visiting
the following pages:
http://lifehacker.com/the-healthiest-foods-for-one-handed-snacking-while-gami-1654728164
http://longform.org/posts/like-something-the-lord-made
After debugging, the issue turned out to be that we are comparing
floating point numbers using ==, and the check sometimes fails even
though the values really close to each other. This patch updates the
DOMTimer code to use WTF::withinEpsilon() instead of operator==()
to compare the floating point intervals.
I confirmed manually that the assertion is no longer hit.
* page/DOMTimer.cpp:
(WebCore::DOMTimer::updateTimerIntervalIfNecessary):
* platform/graphics/FloatQuad.cpp:
(WebCore::FloatQuad::isRectilinear):
(WebCore::withinEpsilon): Deleted.
Source/WTF:
Move the withinEpsilon() function to WTF to avoid code duplication.
* wtf/MathExtras.h:
(WTF::withinEpsilon):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWTFChangeLog">releases/WebKitGTK/webkit-2.6/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWTFwtfMathExtrash">releases/WebKitGTK/webkit-2.6/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorepageDOMTimercpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DOMTimer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsFloatQuadcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/FloatQuad.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WTF/ChangeLog (175954 => 175955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WTF/ChangeLog 2014-11-11 17:59:03 UTC (rev 175954)
+++ releases/WebKitGTK/webkit-2.6/Source/WTF/ChangeLog 2014-11-11 18:15:46 UTC (rev 175955)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-05 Chris Dumez <cdumez@apple.com>
+
+ Assertion hit DOMTimer::updateTimerIntervalIfNecessary()
+ https://bugs.webkit.org/show_bug.cgi?id=138440
+
+ Reviewed by Geoffrey Garen.
+
+ Move the withinEpsilon() function to WTF to avoid code duplication.
+
+ * wtf/MathExtras.h:
+ (WTF::withinEpsilon):
+
</ins><span class="cx"> 2014-10-30 Jeffrey Pfau <jpfau@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_deletionHasBegun) in RefCounted.h should be ASSERT_WITH_SECURITY_IMPLICATION
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WTF/wtf/MathExtras.h (175954 => 175955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WTF/wtf/MathExtras.h 2014-11-11 17:59:03 UTC (rev 175954)
+++ releases/WebKitGTK/webkit-2.6/Source/WTF/wtf/MathExtras.h 2014-11-11 18:15:46 UTC (rev 175955)
</span><span class="lines">@@ -384,6 +384,12 @@
</span><span class="cx"> return log2;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <typename T>
+inline bool withinEpsilon(T a, T b)
+{
+ return std::abs(a - b) <= std::numeric_limits<T>::epsilon();
+}
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> #endif // #ifndef WTF_MathExtras_h
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175954 => 175955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:59:03 UTC (rev 175954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 18:15:46 UTC (rev 175955)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-11-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Assertion hit DOMTimer::updateTimerIntervalIfNecessary()
+ https://bugs.webkit.org/show_bug.cgi?id=138440
+
+ Reviewed by Geoffrey Garen.
+
+ We sometimes hit the ASSERT(repeatInterval() == previousInterval)
+ assertion in DOMTimer::updateTimerIntervalIfNecessary() when visiting
+ the following pages:
+ http://lifehacker.com/the-healthiest-foods-for-one-handed-snacking-while-gami-1654728164
+ http://longform.org/posts/like-something-the-lord-made
+
+ After debugging, the issue turned out to be that we are comparing
+ floating point numbers using ==, and the check sometimes fails even
+ though the values really close to each other. This patch updates the
+ DOMTimer code to use WTF::withinEpsilon() instead of operator==()
+ to compare the floating point intervals.
+
+ I confirmed manually that the assertion is no longer hit.
+
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::updateTimerIntervalIfNecessary):
+ * platform/graphics/FloatQuad.cpp:
+ (WebCore::FloatQuad::isRectilinear):
+ (WebCore::withinEpsilon): Deleted.
+
+2014-11-05 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Stop special-casing the empty string in HTMLInputElement.type setter
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138403
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DOMTimer.cpp (175954 => 175955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DOMTimer.cpp 2014-11-11 17:59:03 UTC (rev 175954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/DOMTimer.cpp 2014-11-11 18:15:46 UTC (rev 175955)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "UserGestureIndicator.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/MathExtras.h>
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -261,11 +262,11 @@
</span><span class="cx"> double previousInterval = m_currentTimerInterval;
</span><span class="cx"> m_currentTimerInterval = intervalClampedToMinimum();
</span><span class="cx">
</span><del>- if (previousInterval == m_currentTimerInterval)
</del><ins>+ if (WTF::withinEpsilon(previousInterval, m_currentTimerInterval))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (repeatInterval()) {
</span><del>- ASSERT(repeatInterval() == previousInterval);
</del><ins>+ ASSERT(WTF::withinEpsilon(repeatInterval(), previousInterval));
</ins><span class="cx"> augmentRepeatInterval(m_currentTimerInterval - previousInterval);
</span><span class="cx"> } else
</span><span class="cx"> augmentFireInterval(m_currentTimerInterval - previousInterval);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreplatformgraphicsFloatQuadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/FloatQuad.cpp (175954 => 175955)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/FloatQuad.cpp 2014-11-11 17:59:03 UTC (rev 175954)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/FloatQuad.cpp 2014-11-11 18:15:46 UTC (rev 175955)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <limits>
</span><ins>+#include <wtf/MathExtras.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -90,15 +91,10 @@
</span><span class="cx"> return FloatRect(left, top, right - left, bottom - top);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool withinEpsilon(float a, float b)
-{
- return fabs(a - b) < std::numeric_limits<float>::epsilon();
-}
-
</del><span class="cx"> bool FloatQuad::isRectilinear() const
</span><span class="cx"> {
</span><del>- return (withinEpsilon(m_p1.x(), m_p2.x()) && withinEpsilon(m_p2.y(), m_p3.y()) && withinEpsilon(m_p3.x(), m_p4.x()) && withinEpsilon(m_p4.y(), m_p1.y()))
- || (withinEpsilon(m_p1.y(), m_p2.y()) && withinEpsilon(m_p2.x(), m_p3.x()) && withinEpsilon(m_p3.y(), m_p4.y()) && withinEpsilon(m_p4.x(), m_p1.x()));
</del><ins>+ return (WTF::withinEpsilon(m_p1.x(), m_p2.x()) && WTF::withinEpsilon(m_p2.y(), m_p3.y()) && WTF::withinEpsilon(m_p3.x(), m_p4.x()) && WTF::withinEpsilon(m_p4.y(), m_p1.y()))
+ || (WTF::withinEpsilon(m_p1.y(), m_p2.y()) && WTF::withinEpsilon(m_p2.x(), m_p3.x()) && WTF::withinEpsilon(m_p3.y(), m_p4.y()) && WTF::withinEpsilon(m_p4.x(), m_p1.x()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool FloatQuad::containsPoint(const FloatPoint& p) const
</span></span></pre>
</div>
</div>
</body>
</html>