<!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>[173978] trunk/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/173978">173978</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-25 14:59:13 -0700 (Thu, 25 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/JavaScriptCore:
Web Replay: Check event loop input extents during replaying too
https://bugs.webkit.org/show_bug.cgi?id=136316
Reviewed by Timothy Hatcher.
Sometimes we see different nondeterminism during capture and replay
executions, so we should add determinism checks during replay too.
Move the withinEventLoopInputExtent flag to the base class, and tighten
the assertion to address <http://webkit.org/b/133019>.
* replay/InputCursor.h:
(JSC::InputCursor::InputCursor):
(JSC::InputCursor::setWithinEventLoopInputExtent): Added.
This assertion is slightly wrong because it does not account for nested run loops.
We can be within two input extents when a nested run loop processes additional
user inputs while the debugger is paused.
This should only be the case when execution is being neither captured or
replayed. The debugger should not pause when capturing, and we should not replay
event loop inputs while in a nested run loop.
(JSC::InputCursor::withinEventLoopInputExtent): Added.
Source/WebCore:
Web Replay: Check event loop input extents during replay too
https://bugs.webkit.org/show_bug.cgi?id=136316
Reviewed by Timothy Hatcher.
Sometimes we see different nondeterminism during capture and replay
executions, so we should support determinism checks during replay too.
Move the withinEventLoopInputExtent flag to the base class.
No new tests, no behavior changed.
* replay/CapturingInputCursor.cpp:
(WebCore::CapturingInputCursor::CapturingInputCursor):
(WebCore::CapturingInputCursor::setWithinEventLoopInputExtent): Deleted.
* replay/CapturingInputCursor.h:
* replay/EventLoopInput.cpp:
(WebCore::EventLoopInputExtent::EventLoopInputExtent):
(WebCore::EventLoopInputExtent::~EventLoopInputExtent):
Make m_cursor a pointer and add a new constructor so we can conditionally
enter event loop input extents. This is useful in some network replay situations.
* replay/EventLoopInput.h:
* replay/ReplayController.cpp:
(WebCore::ReplayController::willDispatchEvent): Expand the assertion to include replaying.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayInputCursorh">trunk/Source/JavaScriptCore/replay/InputCursor.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplayCapturingInputCursorcpp">trunk/Source/WebCore/replay/CapturingInputCursor.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayCapturingInputCursorh">trunk/Source/WebCore/replay/CapturingInputCursor.h</a></li>
<li><a href="#trunkSourceWebCorereplayEventLoopInputcpp">trunk/Source/WebCore/replay/EventLoopInput.cpp</a></li>
<li><a href="#trunkSourceWebCorereplayEventLoopInputh">trunk/Source/WebCore/replay/EventLoopInput.h</a></li>
<li><a href="#trunkSourceWebCorereplayReplayControllercpp">trunk/Source/WebCore/replay/ReplayController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-09-25 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: Check event loop input extents during replaying too
+ https://bugs.webkit.org/show_bug.cgi?id=136316
+
+ Reviewed by Timothy Hatcher.
+
+ Sometimes we see different nondeterminism during capture and replay
+ executions, so we should add determinism checks during replay too.
+
+ Move the withinEventLoopInputExtent flag to the base class, and tighten
+ the assertion to address <http://webkit.org/b/133019>.
+
+ * replay/InputCursor.h:
+ (JSC::InputCursor::InputCursor):
+ (JSC::InputCursor::setWithinEventLoopInputExtent): Added.
+ This assertion is slightly wrong because it does not account for nested run loops.
+ We can be within two input extents when a nested run loop processes additional
+ user inputs while the debugger is paused.
+
+ This should only be the case when execution is being neither captured or
+ replayed. The debugger should not pause when capturing, and we should not replay
+ event loop inputs while in a nested run loop.
+
+ (JSC::InputCursor::withinEventLoopInputExtent): Added.
+
</ins><span class="cx"> 2014-09-25 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove WinCE port from trunk
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayInputCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/InputCursor.h (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/InputCursor.h 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/JavaScriptCore/replay/InputCursor.h 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -40,13 +40,28 @@
</span><span class="cx"> class InputCursor : public RefCounted<InputCursor> {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(InputCursor);
</span><span class="cx"> public:
</span><del>- InputCursor() { }
</del><ins>+ InputCursor()
+ : m_withinEventLoopInputExtent(false)
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> virtual ~InputCursor() { }
</span><span class="cx">
</span><span class="cx"> virtual bool isCapturing() const = 0;
</span><span class="cx"> virtual bool isReplaying() const = 0;
</span><span class="cx">
</span><ins>+ void setWithinEventLoopInputExtent(bool withinEventLoopInputExtent)
+ {
+ // We can be within two input extents when a nested run loop
+ // processes additional user inputs while the debugger is paused.
+ // However, the debugger should not pause when capturing, and we
+ // should not replay event loop inputs while in a nested run loop.
+ ASSERT(m_withinEventLoopInputExtent != withinEventLoopInputExtent || !(isCapturing() || isReplaying()));
+ m_withinEventLoopInputExtent = withinEventLoopInputExtent;
+ }
+
+ bool withinEventLoopInputExtent() const { return m_withinEventLoopInputExtent; }
+
</ins><span class="cx"> template <class InputType, class... Args> inline
</span><span class="cx"> void appendInput(Args&&... args)
</span><span class="cx"> {
</span><span class="lines">@@ -64,6 +79,9 @@
</span><span class="cx"> virtual NondeterministicInputBase* uncheckedLoadInput(InputQueue) = 0;
</span><span class="cx"> protected:
</span><span class="cx"> virtual NondeterministicInputBase* loadInput(InputQueue, const AtomicString&) = 0;
</span><ins>+
+private:
+ bool m_withinEventLoopInputExtent;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/ChangeLog 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-09-25 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: Check event loop input extents during replay too
+ https://bugs.webkit.org/show_bug.cgi?id=136316
+
+ Reviewed by Timothy Hatcher.
+
+ Sometimes we see different nondeterminism during capture and replay
+ executions, so we should support determinism checks during replay too.
+
+ Move the withinEventLoopInputExtent flag to the base class.
+
+ No new tests, no behavior changed.
+
+ * replay/CapturingInputCursor.cpp:
+ (WebCore::CapturingInputCursor::CapturingInputCursor):
+ (WebCore::CapturingInputCursor::setWithinEventLoopInputExtent): Deleted.
+ * replay/CapturingInputCursor.h:
+ * replay/EventLoopInput.cpp:
+ (WebCore::EventLoopInputExtent::EventLoopInputExtent):
+ (WebCore::EventLoopInputExtent::~EventLoopInputExtent):
+ Make m_cursor a pointer and add a new constructor so we can conditionally
+ enter event loop input extents. This is useful in some network replay situations.
+
+ * replay/EventLoopInput.h:
+ * replay/ReplayController.cpp:
+ (WebCore::ReplayController::willDispatchEvent): Expand the assertion to include replaying.
+
</ins><span class="cx"> 2014-09-25 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Race in ref pointer for WebVideoFullscreenInterfaceAVKit.
</span></span></pre></div>
<a id="trunkSourceWebCorereplayCapturingInputCursorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/CapturingInputCursor.cpp (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/CapturingInputCursor.cpp 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/replay/CapturingInputCursor.cpp 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx">
</span><span class="cx"> CapturingInputCursor::CapturingInputCursor(PassRefPtr<ReplaySessionSegment> segment)
</span><span class="cx"> : m_segment(segment)
</span><del>- , m_withinEventLoopInputExtent(false)
</del><span class="cx"> {
</span><span class="cx"> LOG(WebReplay, "%-30sCreated capture cursor=%p.\n", "[ReplayController]", this);
</span><span class="cx"> }
</span><span class="lines">@@ -82,13 +81,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CapturingInputCursor::setWithinEventLoopInputExtent(bool withinEventLoopInputExtent)
-{
- // We cannot enter more than one extent at a time, since they represent a single run loop.
- ASSERT(withinEventLoopInputExtent != m_withinEventLoopInputExtent);
- m_withinEventLoopInputExtent = withinEventLoopInputExtent;
-}
-
</del><span class="cx"> }; // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_REPLAY)
</span></span></pre></div>
<a id="trunkSourceWebCorereplayCapturingInputCursorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/CapturingInputCursor.h (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/CapturingInputCursor.h 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/replay/CapturingInputCursor.h 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> virtual bool isCapturing() const override { return true; }
</span><span class="cx"> virtual bool isReplaying() const override { return false; }
</span><span class="cx">
</span><del>- void setWithinEventLoopInputExtent(bool);
- bool withinEventLoopInputExtent() const { return m_withinEventLoopInputExtent; }
-
</del><span class="cx"> protected:
</span><span class="cx"> virtual NondeterministicInputBase* loadInput(InputQueue, const AtomicString& type) override;
</span><span class="cx">
</span><span class="lines">@@ -61,7 +58,6 @@
</span><span class="cx"> virtual void storeInput(std::unique_ptr<NondeterministicInputBase>) override;
</span><span class="cx">
</span><span class="cx"> RefPtr<ReplaySessionSegment> m_segment;
</span><del>- bool m_withinEventLoopInputExtent;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorereplayEventLoopInputcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/EventLoopInput.cpp (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/EventLoopInput.cpp 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/replay/EventLoopInput.cpp 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -28,25 +28,24 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx">
</span><del>-#include "CapturingInputCursor.h"
</del><ins>+#include <replay/InputCursor.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-EventLoopInputExtent::EventLoopInputExtent(InputCursor& cursor)
</del><ins>+EventLoopInputExtent::EventLoopInputExtent(JSC::InputCursor& cursor)
+ : EventLoopInputExtent(&cursor) { }
+
+EventLoopInputExtent::EventLoopInputExtent(JSC::InputCursor* cursor)
</ins><span class="cx"> : m_cursor(cursor)
</span><span class="cx"> {
</span><del>- if (!m_cursor.isCapturing())
- return;
-
- static_cast<CapturingInputCursor&>(cursor).setWithinEventLoopInputExtent(true);
</del><ins>+ if (m_cursor)
+ m_cursor->setWithinEventLoopInputExtent(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EventLoopInputExtent::~EventLoopInputExtent()
</span><span class="cx"> {
</span><del>- if (!m_cursor.isCapturing())
- return;
-
- static_cast<CapturingInputCursor&>(m_cursor).setWithinEventLoopInputExtent(false);
</del><ins>+ if (m_cursor)
+ m_cursor->setWithinEventLoopInputExtent(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }; // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorereplayEventLoopInputh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/EventLoopInput.h (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/EventLoopInput.h 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/replay/EventLoopInput.h 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -48,9 +48,10 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(EventLoopInputExtent);
</span><span class="cx"> public:
</span><span class="cx"> EventLoopInputExtent(JSC::InputCursor&);
</span><ins>+ EventLoopInputExtent(JSC::InputCursor*);
</ins><span class="cx"> ~EventLoopInputExtent();
</span><span class="cx"> private:
</span><del>- JSC::InputCursor& m_cursor;
</del><ins>+ JSC::InputCursor* m_cursor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class EventLoopInputBase : public NondeterministicInputBase {
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayController.cpp (173977 => 173978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayController.cpp 2014-09-25 21:53:24 UTC (rev 173977)
+++ trunk/Source/WebCore/replay/ReplayController.cpp 2014-09-25 21:59:13 UTC (rev 173978)
</span><span class="lines">@@ -472,8 +472,8 @@
</span><span class="cx"> // To ensure deterministic JS execution, all DOM events must be dispatched deterministically.
</span><span class="cx"> // If these assertions fail, then this DOM event is being dispatched by a nondeterministic EventLoop
</span><span class="cx"> // cycle, and may cause program execution to diverge if any JS code runs because of the DOM event.
</span><del>- if (cursor.isCapturing())
- ASSERT(static_cast<CapturingInputCursor&>(cursor).withinEventLoopInputExtent());
</del><ins>+ if (cursor.isCapturing() || cursor.isReplaying())
+ ASSERT(cursor.withinEventLoopInputExtent());
</ins><span class="cx"> else if (cursor.isReplaying())
</span><span class="cx"> ASSERT(dispatcher().isDispatching());
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>