<!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>[166856] 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/166856">166856</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-04-06 14:51:34 -0700 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Replay: add methods to encode a frame's index based on its FrameTree position
https://bugs.webkit.org/show_bug.cgi?id=131281
Reviewed by Timothy Hatcher.
Given a frame, its encoded index is computed by traversing the frame tree
and saving how many nodes have been traversed to reach a given frame.
This is used to disambiguate frames when dispatching frame-specific event
loop inputs during replay, such as timers and resource loaders.
* replay/SerializationMethods.cpp:
(WebCore::frameIndexFromDocument): Added.
(WebCore::frameIndexFromFrame): Added.
(WebCore::documentFromFrameIndex): Added.
(WebCore::frameFromFrameIndex): Added.
* replay/SerializationMethods.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodscpp">trunk/Source/WebCore/replay/SerializationMethods.cpp</a></li>
<li><a href="#trunkSourceWebCorereplaySerializationMethodsh">trunk/Source/WebCore/replay/SerializationMethods.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166855 => 166856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-06 21:48:04 UTC (rev 166855)
+++ trunk/Source/WebCore/ChangeLog 2014-04-06 21:51:34 UTC (rev 166856)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-04-06 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Replay: add methods to encode a frame's index based on its FrameTree position
+ https://bugs.webkit.org/show_bug.cgi?id=131281
+
+ Reviewed by Timothy Hatcher.
+
+ Given a frame, its encoded index is computed by traversing the frame tree
+ and saving how many nodes have been traversed to reach a given frame.
+
+ This is used to disambiguate frames when dispatching frame-specific event
+ loop inputs during replay, such as timers and resource loaders.
+
+ * replay/SerializationMethods.cpp:
+ (WebCore::frameIndexFromDocument): Added.
+ (WebCore::frameIndexFromFrame): Added.
+ (WebCore::documentFromFrameIndex): Added.
+ (WebCore::frameFromFrameIndex): Added.
+ * replay/SerializationMethods.h:
+
</ins><span class="cx"> 2014-04-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix.
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (166855 => 166856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-04-06 21:48:04 UTC (rev 166855)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp 2014-04-06 21:51:34 UTC (rev 166856)
</span><span class="lines">@@ -31,6 +31,11 @@
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx">
</span><span class="cx"> #include "AllReplayInputs.h"
</span><ins>+#include "Document.h"
+#include "Frame.h"
+#include "FrameTree.h"
+#include "MainFrame.h"
+#include "Page.h"
</ins><span class="cx"> #include "PlatformKeyboardEvent.h"
</span><span class="cx"> #include "PlatformMouseEvent.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="lines">@@ -61,6 +66,51 @@
</span><span class="cx"> WEB_REPLAY_INPUT_NAMES_FOR_EACH(IMPORT_FROM_WEBCORE_NAMESPACE)
</span><span class="cx"> #undef IMPORT_FROM_WEBCORE_NAMESPACE
</span><span class="cx">
</span><ins>+namespace WebCore {
+
+unsigned long frameIndexFromDocument(const Document* document)
+{
+ ASSERT(document);
+ ASSERT(document->frame());
+ return frameIndexFromFrame(document->frame());
+}
+
+unsigned long frameIndexFromFrame(const Frame* targetFrame)
+{
+ ASSERT(targetFrame);
+
+ unsigned long currentIndex = 0;
+ const Frame* mainFrame = &targetFrame->tree().top();
+ for (const Frame* frame = mainFrame; frame; ++currentIndex, frame = frame->tree().traverseNext(mainFrame)) {
+ if (frame == targetFrame)
+ return currentIndex;
+ }
+
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+Document* documentFromFrameIndex(Page* page, unsigned long frameIndex)
+{
+ Frame* frame = frameFromFrameIndex(page, frameIndex);
+ return frame ? frame->document() : nullptr;
+}
+
+Frame* frameFromFrameIndex(Page* page, unsigned long frameIndex)
+{
+ ASSERT(page);
+ ASSERT(frameIndex >= 0);
+
+ MainFrame* mainFrame = &page->mainFrame();
+ Frame* frame = mainFrame;
+ unsigned long currentIndex = 0;
+ for (; currentIndex < frameIndex && frame; ++currentIndex, frame = frame->tree().traverseNext(mainFrame)) { }
+
+ return frame;
+}
+
+} // namespace WebCore
+
</ins><span class="cx"> #define ENCODE_TYPE_WITH_KEY(_encodedValue, _type, _key, _value) \
</span><span class="cx"> _encodedValue.put<_type>(ASCIILiteral(#_key), _value)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.h (166855 => 166856)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.h 2014-04-06 21:48:04 UTC (rev 166855)
+++ trunk/Source/WebCore/replay/SerializationMethods.h 2014-04-06 21:51:34 UTC (rev 166856)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+
</ins><span class="cx"> class Document;
</span><span class="cx"> class Frame;
</span><span class="cx"> class Page;
</span><span class="lines">@@ -47,6 +48,12 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> struct KeypressCommand;
</span><span class="cx"> #endif
</span><ins>+
+unsigned long frameIndexFromDocument(const Document*);
+unsigned long frameIndexFromFrame(const Frame*);
+Document* documentFromFrameIndex(Page*, unsigned long frameIndex);
+Frame* frameFromFrameIndex(Page*, unsigned long frameIndex);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> // Template specializations must be defined in the same namespace as the template declaration.
</span></span></pre>
</div>
</div>
</body>
</html>