<!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>[173133] trunk/Source/WebCore</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/173133">173133</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 18:33:24 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make timerNestingLevel threadsafe
https://bugs.webkit.org/show_bug.cgi?id=136401
Reviewed by Tim Horton.
timerNestingLevel, used by DOMTimer to determine whether a timer is 'nested'
(repeating, possible due to a timer rescheduling itself) is a global. Since
worker threads can set timers too this is not thread safe.
* dom/ScriptExecutionContext.cpp:
(WebCore::ScriptExecutionContext::ScriptExecutionContext):
- added initialize m_timerNestingLevel
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::timerNestingLevel):
(WebCore::ScriptExecutionContext::setTimerNestingLevel):
- added accessors
* page/DOMTimer.cpp:
(WebCore::DOMTimer::DOMTimer):
(WebCore::DOMTimer::fired):
- move timerNestingLevel to the context</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorepageDOMTimercpp">trunk/Source/WebCore/page/DOMTimer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173132 => 173133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-30 01:11:23 UTC (rev 173132)
+++ trunk/Source/WebCore/ChangeLog 2014-08-30 01:33:24 UTC (rev 173133)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-08-29 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><ins>+ Make timerNestingLevel threadsafe
+ https://bugs.webkit.org/show_bug.cgi?id=136401
+
+ Reviewed by Tim Horton.
+
+ timerNestingLevel, used by DOMTimer to determine whether a timer is 'nested'
+ (repeating, possible due to a timer rescheduling itself) is a global. Since
+ worker threads can set timers too this is not thread safe.
+
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::ScriptExecutionContext::ScriptExecutionContext):
+ - added initialize m_timerNestingLevel
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::timerNestingLevel):
+ (WebCore::ScriptExecutionContext::setTimerNestingLevel):
+ - added accessors
+ * page/DOMTimer.cpp:
+ (WebCore::DOMTimer::DOMTimer):
+ (WebCore::DOMTimer::fired):
+ - move timerNestingLevel to the context
+
+2014-08-29 Gavin Barraclough <barraclough@apple.com>
+
</ins><span class="cx"> DOMTimer::m_nestingLevel is prone to overflow
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136399
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (173132 => 173133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-08-30 01:11:23 UTC (rev 173132)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-08-30 01:33:24 UTC (rev 173133)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> , m_reasonForSuspendingActiveDOMObjects(static_cast<ActiveDOMObject::ReasonForSuspension>(-1))
</span><span class="cx"> , m_activeDOMObjectsAreStopped(false)
</span><span class="cx"> , m_activeDOMObjectAdditionForbidden(false)
</span><ins>+ , m_timerNestingLevel(0)
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> , m_inScriptExecutionContextDestructor(false)
</span><span class="cx"> , m_activeDOMObjectRemovalForbidden(false)
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (173132 => 173133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-08-30 01:11:23 UTC (rev 173132)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2014-08-30 01:33:24 UTC (rev 173133)
</span><span class="lines">@@ -175,6 +175,9 @@
</span><span class="cx"> virtual bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ int timerNestingLevel() const { return m_timerNestingLevel; }
+ void setTimerNestingLevel(int timerNestingLevel) { m_timerNestingLevel = timerNestingLevel; }
+
</ins><span class="cx"> protected:
</span><span class="cx"> class AddConsoleMessageTask : public Task {
</span><span class="cx"> public:
</span><span class="lines">@@ -223,6 +226,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool m_activeDOMObjectAdditionForbidden;
</span><ins>+ int m_timerNestingLevel;
</ins><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> bool m_inScriptExecutionContextDestructor;
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMTimercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMTimer.cpp (173132 => 173133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMTimer.cpp 2014-08-30 01:11:23 UTC (rev 173132)
+++ trunk/Source/WebCore/page/DOMTimer.cpp 2014-08-30 01:33:24 UTC (rev 173133)
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx"> static const int maxTimerNestingLevel = 5;
</span><span class="cx"> static const double oneMillisecond = 0.001;
</span><span class="cx">
</span><del>-static int timerNestingLevel = 0;
-
</del><span class="cx"> static inline bool shouldForwardUserGesture(int interval, int nestingLevel)
</span><span class="cx"> {
</span><span class="cx"> return UserGestureIndicator::processingUserGesture()
</span><span class="lines">@@ -60,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> DOMTimer::DOMTimer(ScriptExecutionContext* context, std::unique_ptr<ScheduledAction> action, int interval, bool singleShot)
</span><span class="cx"> : SuspendableTimer(context)
</span><del>- , m_nestingLevel(timerNestingLevel)
</del><ins>+ , m_nestingLevel(context->timerNestingLevel())
</ins><span class="cx"> , m_action(WTF::move(action))
</span><span class="cx"> , m_originalInterval(interval)
</span><span class="cx"> , m_shouldForwardUserGesture(shouldForwardUserGesture(interval, m_nestingLevel))
</span><span class="lines">@@ -130,7 +128,7 @@
</span><span class="cx"> ASSERT(!document->frame()->timersPaused());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- timerNestingLevel = std::min(m_nestingLevel + 1, maxTimerNestingLevel);
</del><ins>+ context->setTimerNestingLevel(std::min(m_nestingLevel + 1, maxTimerNestingLevel));
</ins><span class="cx">
</span><span class="cx"> ASSERT(!isSuspended());
</span><span class="cx"> ASSERT(!context->activeDOMObjectsAreSuspended());
</span><span class="lines">@@ -192,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didFireTimer(cookie);
</span><span class="cx">
</span><del>- timerNestingLevel = 0;
</del><ins>+ context->setTimerNestingLevel(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMTimer::didStop()
</span></span></pre>
</div>
</div>
</body>
</html>