<!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>[171528] 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/171528">171528</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-07-24 15:11:12 -0700 (Thu, 24 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Replay: don't encode/decode primitive types that lack explicit sizes
https://bugs.webkit.org/show_bug.cgi?id=133430

Reviewed by Anders Carlsson.

Source/JavaScriptCore:
Don't support encode/decode of unsigned long, since its size is compiler-dependent.

* replay/EncodedValue.cpp:
(JSC::EncodedValue::convertTo&lt;unsigned long&gt;):
(JSC::unsigned long&gt;::encodeValue): Deleted.
* replay/EncodedValue.h:

Source/WebCore:
Remove uses of unsigned long in encode/decode methods because the type lacks an
explicit size. Move frame index serialization away from using unsigned long.

* replay/ReplayController.cpp:
(WebCore::logDispatchedDOMEvent): Fix the format string.
* replay/SerializationMethods.cpp:
(WebCore::frameIndexFromDocument):
(WebCore::frameIndexFromFrame):
(WebCore::documentFromFrameIndex):
(WebCore::frameFromFrameIndex):
(JSC::EncodingTraits&lt;PluginData&gt;::encodeValue):
(JSC::EncodingTraits&lt;PluginData&gt;::decodeValue):
* replay/SerializationMethods.h:
* replay/WebInputs.json: Remove primitive types without explicit sizes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValuecpp">trunk/Source/JavaScriptCore/replay/EncodedValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorereplayEncodedValueh">trunk/Source/JavaScriptCore/replay/EncodedValue.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorereplayReplayControllercpp">trunk/Source/WebCore/replay/ReplayController.cpp</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>
<li><a href="#trunkSourceWebCorereplayWebInputsjson">trunk/Source/WebCore/replay/WebInputs.json</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-24  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
+
+        Web Replay: don't encode/decode primitive types that lack explicit sizes
+        https://bugs.webkit.org/show_bug.cgi?id=133430
+
+        Reviewed by Anders Carlsson.
+
+        Don't support encode/decode of unsigned long, since its size is compiler-dependent.
+
+        * replay/EncodedValue.cpp:
+        (JSC::EncodedValue::convertTo&lt;unsigned long&gt;):
+        (JSC::unsigned long&gt;::encodeValue): Deleted.
+        * replay/EncodedValue.h:
+
</ins><span class="cx"> 2014-07-24  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         JSWrapperMap's jsWrapperForObject() needs to defer GC.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.cpp (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.cpp        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.cpp        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -90,11 +90,6 @@
</span><span class="cx">     return EncodedValue(InspectorBasicValue::create((double)value));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; EncodedValue ScalarEncodingTraits&lt;unsigned long&gt;::encodeValue(const unsigned long&amp; value)
-{
-    return EncodedValue(InspectorBasicValue::create((double)value));
-}
-
</del><span class="cx"> template&lt;&gt; bool EncodedValue::convertTo&lt;bool&gt;()
</span><span class="cx"> {
</span><span class="cx">     bool result;
</span><span class="lines">@@ -158,15 +153,6 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-template&lt;&gt; unsigned long EncodedValue::convertTo&lt;unsigned long&gt;()
-{
-    unsigned long result;
-    bool castSucceeded = m_value-&gt;asNumber(&amp;result);
-    ASSERT_UNUSED(castSucceeded, castSucceeded);
-
-    return result;
-}
-
</del><span class="cx"> template&lt;&gt; String EncodedValue::convertTo&lt;String&gt;()
</span><span class="cx"> {
</span><span class="cx">     String result;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorereplayEncodedValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/replay/EncodedValue.h (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/replay/EncodedValue.h        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/JavaScriptCore/replay/EncodedValue.h        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx"> template&lt;&gt; JS_EXPORT_PRIVATE int64_t EncodedValue::convertTo&lt;int64_t&gt;();
</span><span class="cx"> template&lt;&gt; JS_EXPORT_PRIVATE uint32_t EncodedValue::convertTo&lt;uint32_t&gt;();
</span><span class="cx"> template&lt;&gt; JS_EXPORT_PRIVATE uint64_t EncodedValue::convertTo&lt;uint64_t&gt;();
</span><del>-template&lt;&gt; JS_EXPORT_PRIVATE unsigned long EncodedValue::convertTo&lt;unsigned long&gt;();
</del><span class="cx"> template&lt;&gt; JS_EXPORT_PRIVATE String EncodedValue::convertTo&lt;String&gt;();
</span><span class="cx"> 
</span><span class="cx"> template&lt;typename T&gt;
</span><span class="lines">@@ -156,7 +155,6 @@
</span><span class="cx"> template&lt;&gt; struct EncodingTraits&lt;int64_t&gt; : public ScalarEncodingTraits&lt;int64_t&gt; { };
</span><span class="cx"> template&lt;&gt; struct EncodingTraits&lt;uint32_t&gt; : public ScalarEncodingTraits&lt;uint32_t&gt; { };
</span><span class="cx"> template&lt;&gt; struct EncodingTraits&lt;uint64_t&gt; : public ScalarEncodingTraits&lt;uint64_t&gt; { };
</span><del>-template&lt;&gt; struct EncodingTraits&lt;unsigned long&gt; : public ScalarEncodingTraits&lt;unsigned long&gt; { };
</del><span class="cx"> 
</span><span class="cx"> template&lt;&gt; struct EncodingTraits&lt;String&gt; : public ScalarEncodingTraits&lt;String&gt; {
</span><span class="cx">     static EncodedValue encodeValue(const String&amp; value)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/WebCore/ChangeLog        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-24  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
+
+        Web Replay: don't encode/decode primitive types that lack explicit sizes
+        https://bugs.webkit.org/show_bug.cgi?id=133430
+
+        Reviewed by Anders Carlsson.
+
+        Remove uses of unsigned long in encode/decode methods because the type lacks an
+        explicit size. Move frame index serialization away from using unsigned long.
+
+        * replay/ReplayController.cpp:
+        (WebCore::logDispatchedDOMEvent): Fix the format string.
+        * replay/SerializationMethods.cpp:
+        (WebCore::frameIndexFromDocument):
+        (WebCore::frameIndexFromFrame):
+        (WebCore::documentFromFrameIndex):
+        (WebCore::frameFromFrameIndex):
+        (JSC::EncodingTraits&lt;PluginData&gt;::encodeValue):
+        (JSC::EncodingTraits&lt;PluginData&gt;::decodeValue):
+        * replay/SerializationMethods.h:
+        * replay/WebInputs.json: Remove primitive types without explicit sizes.
+
</ins><span class="cx"> 2014-07-24  Pratik Solanki  &lt;psolanki@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Sharing SharedBuffer between WebCore and ImageIO is racy and crash prone
</span></span></pre></div>
<a id="trunkSourceWebCorereplayReplayControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/ReplayController.cpp (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/ReplayController.cpp        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/WebCore/replay/ReplayController.cpp        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -67,14 +67,14 @@
</span><span class="cx"> 
</span><span class="cx">     // A DOM event is unrelated if it is being dispatched to a document that is neither capturing nor replaying.
</span><span class="cx">     if (Node* node = target-&gt;toNode()) {
</span><del>-        LOG(WebReplay, &quot;%-20s ---&gt;%s DOM event: type=%s, target=%lu/node[%p] %s\n&quot;, &quot;ReplayEvents&quot;,
</del><ins>+        LOG(WebReplay, &quot;%-20s ---&gt;%s DOM event: type=%s, target=%u/node[%p] %s\n&quot;, &quot;ReplayEvents&quot;,
</ins><span class="cx">             (eventIsUnrelated) ? &quot;Unrelated&quot; : &quot;Dispatching&quot;,
</span><span class="cx">             event.type().string().utf8().data(),
</span><span class="cx">             frameIndexFromDocument((node-&gt;inDocument()) ? &amp;node-&gt;document() : node-&gt;ownerDocument()),
</span><span class="cx">             node,
</span><span class="cx">             node-&gt;nodeName().utf8().data());
</span><span class="cx">     } else if (DOMWindow* window = target-&gt;toDOMWindow()) {
</span><del>-        LOG(WebReplay, &quot;%-20s ---&gt;%s DOM event: type=%s, target=%lu/window[%p] %s\n&quot;, &quot;ReplayEvents&quot;,
</del><ins>+        LOG(WebReplay, &quot;%-20s ---&gt;%s DOM event: type=%s, target=%u/window[%p] %s\n&quot;, &quot;ReplayEvents&quot;,
</ins><span class="cx">             (eventIsUnrelated) ? &quot;Unrelated&quot; : &quot;Dispatching&quot;,
</span><span class="cx">             event.type().string().utf8().data(),
</span><span class="cx">             frameIndexFromDocument(window-&gt;document()),
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.cpp (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.cpp        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/WebCore/replay/SerializationMethods.cpp        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -72,18 +72,18 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-unsigned long frameIndexFromDocument(const Document* document)
</del><ins>+uint32_t frameIndexFromDocument(const Document* document)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(document);
</span><span class="cx">     ASSERT(document-&gt;frame());
</span><span class="cx">     return frameIndexFromFrame(document-&gt;frame());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-unsigned long frameIndexFromFrame(const Frame* targetFrame)
</del><ins>+uint32_t frameIndexFromFrame(const Frame* targetFrame)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(targetFrame);
</span><span class="cx"> 
</span><del>-    unsigned long currentIndex = 0;
</del><ins>+    uint32_t currentIndex = 0;
</ins><span class="cx">     const Frame* mainFrame = &amp;targetFrame-&gt;tree().top();
</span><span class="cx">     for (const Frame* frame = mainFrame; frame; ++currentIndex, frame = frame-&gt;tree().traverseNext(mainFrame)) {
</span><span class="cx">         if (frame == targetFrame)
</span><span class="lines">@@ -94,20 +94,20 @@
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Document* documentFromFrameIndex(Page* page, unsigned long frameIndex)
</del><ins>+Document* documentFromFrameIndex(Page* page, uint32_t frameIndex)
</ins><span class="cx"> {
</span><span class="cx">     Frame* frame = frameFromFrameIndex(page, frameIndex);
</span><span class="cx">     return frame ? frame-&gt;document() : nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Frame* frameFromFrameIndex(Page* page, unsigned long frameIndex)
</del><ins>+Frame* frameFromFrameIndex(Page* page, uint32_t frameIndex)
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(page);
</span><span class="cx">     ASSERT(frameIndex &gt;= 0);
</span><span class="cx"> 
</span><span class="cx">     MainFrame* mainFrame = &amp;page-&gt;mainFrame();
</span><span class="cx">     Frame* frame = mainFrame;
</span><del>-    unsigned long currentIndex = 0;
</del><ins>+    uint32_t currentIndex = 0;
</ins><span class="cx">     for (; currentIndex &lt; frameIndex &amp;&amp; frame; ++currentIndex, frame = frame-&gt;tree().traverseNext(mainFrame)) { }
</span><span class="cx"> 
</span><span class="cx">     return frame;
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx">     DECODE_TYPE_WITH_KEY(encodedValue, Vector&lt;KeypressCommand&gt;, commands);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, windowsVirtualKeyCode, nativeVirtualKeyCode, macCharCode, autoRepeat, keypad, systemKey, modifiers, timestamp);
</del><ins>+    PlatformKeyboardEvent platformEvent = PlatformKeyboardEvent(type, text, unmodifiedText, keyIdentifier, WTF::safeCast&lt;int&gt;(windowsVirtualKeyCode), WTF::safeCast&lt;int&gt;(nativeVirtualKeyCode), WTF::safeCast&lt;int&gt;(macCharCode), autoRepeat, keypad, systemKey, modifiers, timestamp);
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx">     input = std::make_unique&lt;PlatformKeyboardEventAppKit&gt;(platformEvent, handledByInputMethod, commands);
</span><span class="cx"> #else
</span><span class="lines">@@ -445,9 +445,13 @@
</span><span class="cx"> {
</span><span class="cx">     EncodedValue encodedData = EncodedValue::createObject();
</span><span class="cx"> 
</span><ins>+    Vector&lt;uint32_t&gt; castedMimePluginIndices(input-&gt;mimePluginIndices().size());
+    for (uint32_t index : input-&gt;mimePluginIndices())
+        castedMimePluginIndices.append(WTF::safeCast&lt;uint32_t&gt;(index));
+
</ins><span class="cx">     ENCODE_TYPE_WITH_KEY(encodedData, Vector&lt;PluginInfo&gt;, plugins, input-&gt;plugins());
</span><span class="cx">     ENCODE_TYPE_WITH_KEY(encodedData, Vector&lt;MimeClassInfo&gt;, mimes, input-&gt;mimes());
</span><del>-    ENCODE_TYPE_WITH_KEY(encodedData, Vector&lt;size_t&gt;, mimePluginIndices, input-&gt;mimePluginIndices());
</del><ins>+    ENCODE_TYPE_WITH_KEY(encodedData, Vector&lt;uint32_t&gt;, mimePluginIndices, castedMimePluginIndices);
</ins><span class="cx"> 
</span><span class="cx">     return encodedData;
</span><span class="cx"> }
</span><span class="lines">@@ -464,10 +468,14 @@
</span><span class="cx"> {
</span><span class="cx">     DECODE_TYPE_WITH_KEY(encodedData, Vector&lt;PluginInfo&gt;, plugins);
</span><span class="cx">     DECODE_TYPE_WITH_KEY(encodedData, Vector&lt;MimeClassInfo&gt;, mimes);
</span><del>-    DECODE_TYPE_WITH_KEY(encodedData, Vector&lt;size_t&gt;, mimePluginIndices);
</del><ins>+    DECODE_TYPE_WITH_KEY(encodedData, Vector&lt;uint32_t&gt;, mimePluginIndices);
</ins><span class="cx"> 
</span><del>-    input = adoptRef(new DeserializedPluginData(plugins, mimes, mimePluginIndices));
</del><ins>+    Vector&lt;size_t&gt; castedMimePluginIndices(mimePluginIndices.size());
+    for (uint32_t index : mimePluginIndices)
+        castedMimePluginIndices.append(WTF::safeCast&lt;size_t&gt;(index));
</ins><span class="cx"> 
</span><ins>+    input = adoptRef(new DeserializedPluginData(plugins, mimes, castedMimePluginIndices));
+
</ins><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorereplaySerializationMethodsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/SerializationMethods.h (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/SerializationMethods.h        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/WebCore/replay/SerializationMethods.h        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> struct KeypressCommand;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-unsigned long frameIndexFromDocument(const Document*);
-unsigned long frameIndexFromFrame(const Frame*);
-Document* documentFromFrameIndex(Page*, unsigned long frameIndex);
-Frame* frameFromFrameIndex(Page*, unsigned long frameIndex);
</del><ins>+uint32_t frameIndexFromDocument(const Document*);
+uint32_t frameIndexFromFrame(const Frame*);
+Document* documentFromFrameIndex(Page*, uint32_t frameIndex);
+Frame* frameFromFrameIndex(Page*, uint32_t frameIndex);
</ins><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorereplayWebInputsjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/replay/WebInputs.json (171527 => 171528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/replay/WebInputs.json        2014-07-24 22:01:40 UTC (rev 171527)
+++ trunk/Source/WebCore/replay/WebInputs.json        2014-07-24 22:11:12 UTC (rev 171528)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx">         &quot;Global&quot;: [
</span><span class="cx">             { &quot;name&quot;: &quot;bool&quot;, &quot;mode&quot;: &quot;SCALAR&quot; },
</span><span class="cx">             { &quot;name&quot;: &quot;double&quot;, &quot;mode&quot;: &quot;SCALAR&quot; },
</span><del>-            { &quot;name&quot;: &quot;int&quot;, &quot;mode&quot;: &quot;SCALAR&quot; },
-            { &quot;name&quot;: &quot;unsigned&quot;, &quot;mode&quot;: &quot;SCALAR&quot; },
-            { &quot;name&quot;: &quot;unsigned long&quot;, &quot;mode&quot;: &quot;SCALAR&quot; },
-            { &quot;name&quot;: &quot;unsigned long long&quot;, &quot;mode&quot;: &quot;SCALAR&quot; }
</del><ins>+            { &quot;name&quot;: &quot;uint32_t&quot;, &quot;mode&quot;: &quot;SCALAR&quot;, &quot;description&quot;: &quot;Unsigned 32-bit integer.&quot; },
+            { &quot;name&quot;: &quot;uint64_t&quot;, &quot;mode&quot;: &quot;SCALAR&quot;, &quot;description&quot;: &quot;Unsigned 64-bit integer.&quot; },
+            { &quot;name&quot;: &quot;int32_t&quot;, &quot;mode&quot;: &quot;SCALAR&quot;, &quot;description&quot;: &quot;Signed 32-bit integer.&quot; },
+            { &quot;name&quot;: &quot;int64_t&quot;, &quot;mode&quot;: &quot;SCALAR&quot;, &quot;description&quot;: &quot;Signed 64-bit integer.&quot; }
</ins><span class="cx">         ],
</span><span class="cx"> 
</span><span class="cx">         &quot;WTF&quot;: [
</span></span></pre>
</div>
</div>

</body>
</html>