<!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>[81571] trunk</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/81571">81571</a></dd>
<dt>Author</dt> <dd>pfeldman@chromium.org</dd>
<dt>Date</dt> <dd>2011-03-21 00:44:51 -0700 (Mon, 21 Mar 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>2011-03-21  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: make frameId in network agent of type string, not unsigned long.
        https://bugs.webkit.org/show_bug.cgi?id=56708

        * inspector/report-protocol-errors-expected.txt:
2011-03-21  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: make frameId in network agent of type string, not unsigned long.
        https://bugs.webkit.org/show_bug.cgi?id=56708

        * inspector/Inspector.json:
        * inspector/InspectorAgent.cpp:
        (WebCore::InspectorAgent::highlightFrame):
        * inspector/InspectorAgent.h:
        * inspector/InspectorResourceAgent.cpp:
        (WebCore::pointerAsId):
        (WebCore::buildObjectForDocumentLoader):
        (WebCore::buildObjectForFrame):
        (WebCore::InspectorResourceAgent::frameDetachedFromParent):
        (WebCore::InspectorResourceAgent::frameForId):
        (WebCore::InspectorResourceAgent::resourceContent):
        * inspector/InspectorResourceAgent.h:
        * inspector/front-end/ResourcesPanel.js:
        (WebInspector.ResourcesPanel.prototype.addOrUpdateFrame):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectorreportprotocolerrorsexpectedtxt">trunk/LayoutTests/inspector/report-protocol-errors-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorjson">trunk/Source/WebCore/inspector/Inspector.json</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgentcpp">trunk/Source/WebCore/inspector/InspectorAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorAgenth">trunk/Source/WebCore/inspector/InspectorAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgenth">trunk/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorfrontendResourcesPaneljs">trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/LayoutTests/ChangeLog 2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -2,6 +2,15 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Yury Semikhatsky.
</span><span class="cx"> 
</span><ins>+        Web Inspector: make frameId in network agent of type string, not unsigned long.
+        https://bugs.webkit.org/show_bug.cgi?id=56708
+
+        * inspector/report-protocol-errors-expected.txt:
+
+2011-03-21  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
</ins><span class="cx">         Web Inspector: expose object id as string, not JSON struct in the protocol.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=56681
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorreportprotocolerrorsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/report-protocol-errors-expected.txt (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/report-protocol-errors-expected.txt  2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/LayoutTests/inspector/report-protocol-errors-expected.txt     2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> {
</span><span class="cx">     requestId : 4
</span><span class="cx">     protocolErrors : {
</span><del>-        0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
</del><ins>+        0 : "Protocol Error: Argument 'frameId' with type 'String' was not found."
</ins><span class="cx">         1 : "Protocol Error: Argument 'url' with type 'String' was not found."
</span><span class="cx">         2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
</span><span class="cx">     }
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> {
</span><span class="cx">     requestId : 5
</span><span class="cx">     protocolErrors : {
</span><del>-        0 : "Protocol Error: Argument 'frameId' with type 'Number' was not found."
</del><ins>+        0 : "Protocol Error: Argument 'frameId' with type 'String' was not found."
</ins><span class="cx">         1 : "Protocol Error: Argument 'url' with type 'String' was not found."
</span><span class="cx">         2 : "Protocol Error: Argument 'base64Encode' with type 'Boolean' was not found."
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/ChangeLog      2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -2,6 +2,28 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Yury Semikhatsky.
</span><span class="cx"> 
</span><ins>+        Web Inspector: make frameId in network agent of type string, not unsigned long.
+        https://bugs.webkit.org/show_bug.cgi?id=56708
+
+        * inspector/Inspector.json:
+        * inspector/InspectorAgent.cpp:
+        (WebCore::InspectorAgent::highlightFrame):
+        * inspector/InspectorAgent.h:
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::pointerAsId):
+        (WebCore::buildObjectForDocumentLoader):
+        (WebCore::buildObjectForFrame):
+        (WebCore::InspectorResourceAgent::frameDetachedFromParent):
+        (WebCore::InspectorResourceAgent::frameForId):
+        (WebCore::InspectorResourceAgent::resourceContent):
+        * inspector/InspectorResourceAgent.h:
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.addOrUpdateFrame):
+
+2011-03-21  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
</ins><span class="cx">         Web Inspector: expose object id as string, not JSON struct in the protocol.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=56681
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/Inspector.json (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/Inspector.json    2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/Inspector.json       2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">             {
</span><span class="cx">                 "name": "highlightFrame",
</span><span class="cx">                 "parameters": [
</span><del>-                    { "name": "frameId", "type": "unsigned" }
</del><ins>+                    { "name": "frameId", "type": "string" }
</ins><span class="cx">                 ]
</span><span class="cx">             },
</span><span class="cx">             {
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">             {
</span><span class="cx">                 "name": "resourceContent",
</span><span class="cx">                 "parameters": [
</span><del>-                    { "name": "frameId", "type": "unsigned" },
</del><ins>+                    { "name": "frameId", "type": "string" },
</ins><span class="cx">                     { "name": "url", "type": "string" },
</span><span class="cx">                     { "name": "base64Encode", "type": "boolean" }
</span><span class="cx">                 ],
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">             {
</span><span class="cx">                 "name": "frameDetachedFromParent",
</span><span class="cx">                 "parameters": [
</span><del>-                    { "name": "frameId", "type": "unsigned" }
</del><ins>+                    { "name": "frameId", "type": "string" }
</ins><span class="cx">                 ]
</span><span class="cx">             },
</span><span class="cx">             {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.cpp (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.cpp        2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/InspectorAgent.cpp   2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -283,15 +283,11 @@
</span><span class="cx">         highlight(error, node);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorAgent::highlightFrame(ErrorString* error, unsigned long frameId)
</del><ins>+void InspectorAgent::highlightFrame(ErrorString* error, const String& frameId)
</ins><span class="cx"> {
</span><del>-    Frame* mainFrame = m_inspectedPage->mainFrame();
-    for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext(mainFrame)) {
-        if (reinterpret_cast<uintptr_t>(frame) == frameId && frame->ownerElement()) {
-            highlight(error, frame->ownerElement());
-            return;
-        }
-    }
</del><ins>+    Frame* frame = m_resourceAgent->frameForId(frameId);
+    if (frame && frame->ownerElement())
+        highlight(error, frame->ownerElement());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void InspectorAgent::hideHighlight(ErrorString*)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAgent.h (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAgent.h  2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/InspectorAgent.h     2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -112,18 +112,18 @@
</span><span class="cx">     Page* inspectedPage() const { return m_inspectedPage; }
</span><span class="cx">     KURL inspectedURL() const;
</span><span class="cx">     KURL inspectedURLWithoutFragment() const;
</span><del>-    void reloadPage(ErrorString* error, bool ignoreCache);
</del><ins>+    void reloadPage(ErrorString*, bool ignoreCache);
</ins><span class="cx">     void showConsole();
</span><span class="cx"> 
</span><span class="cx">     void restoreInspectorStateFromCookie(const String& inspectorCookie);
</span><span class="cx"> 
</span><del>-    void highlight(ErrorString* error, Node*);
-    void hideHighlight(ErrorString* error);
</del><ins>+    void highlight(ErrorString*, Node*);
+    void hideHighlight(ErrorString*);
</ins><span class="cx">     void inspect(Node*);
</span><del>-    void highlightDOMNode(ErrorString* error, long nodeId);
</del><ins>+    void highlightDOMNode(ErrorString*, long nodeId);
</ins><span class="cx">     void hideDOMNodeHighlight(ErrorString* error) { hideHighlight(error); }
</span><span class="cx"> 
</span><del>-    void highlightFrame(ErrorString* error, unsigned long frameId);
</del><ins>+    void highlightFrame(ErrorString*, const String& frameId);
</ins><span class="cx">     void hideFrameHighlight(ErrorString* error) { hideHighlight(error); }
</span><span class="cx"> 
</span><span class="cx">     void setFrontend(InspectorFrontend*);
</span><span class="lines">@@ -162,8 +162,8 @@
</span><span class="cx"> 
</span><span class="cx">     void didCommitLoad(DocumentLoader*);
</span><span class="cx"> 
</span><del>-    void getCookies(ErrorString* error, RefPtr<InspectorArray>* cookies, WTF::String* cookiesString);
-    void deleteCookie(ErrorString* error, const String& cookieName, const String& domain);
</del><ins>+    void getCookies(ErrorString*, RefPtr<InspectorArray>* cookies, WTF::String* cookiesString);
+    void deleteCookie(ErrorString*, const String& cookieName, const String& domain);
</ins><span class="cx"> 
</span><span class="cx">     void domContentLoadedEventFired(DocumentLoader*, const KURL&);
</span><span class="cx">     void loadEventFired(DocumentLoader*, const KURL&);
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">     bool hasFrontend() const { return m_frontend; }
</span><span class="cx"> 
</span><span class="cx">     void drawNodeHighlight(GraphicsContext&) const;
</span><del>-    void openInInspectedWindow(ErrorString* error, const String& url);
</del><ins>+    void openInInspectedWindow(ErrorString*, const String& url);
</ins><span class="cx">     void drawElementTitle(GraphicsContext&, const IntRect& boundingBox, const IntRect& anchorBox, const FloatRect& overlayRect, WebCore::Settings*) const;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(JAVASCRIPT_DEBUGGER)
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx">     // Generic code called from custom implementations.
</span><span class="cx">     void evaluateForTestInFrontend(long testCallId, const String& script);
</span><span class="cx"> 
</span><del>-    void addScriptToEvaluateOnLoad(ErrorString* error, const String& source);
-    void removeAllScriptsToEvaluateOnLoad(ErrorString* error);
</del><ins>+    void addScriptToEvaluateOnLoad(ErrorString*, const String& source);
+    void removeAllScriptsToEvaluateOnLoad(ErrorString*);
</ins><span class="cx">     void setInspectorExtensionAPI(const String& source);
</span><span class="cx"> 
</span><span class="cx">     InspectorState* state() { return m_state.get(); }
</span><span class="lines">@@ -200,10 +200,10 @@
</span><span class="cx">     void getInspectorState(RefPtr<InspectorObject>* state);
</span><span class="cx">     void setMonitoringXHREnabled(bool enabled, bool* newState);
</span><span class="cx">     // Following are used from InspectorBackend and internally.
</span><del>-    void setSearchingForNode(ErrorString* error, bool enabled, bool* newState);
-    void didEvaluateForTestInFrontend(ErrorString* error, long callId, const String& jsonResult);
</del><ins>+    void setSearchingForNode(ErrorString*, bool enabled, bool* newState);
+    void didEvaluateForTestInFrontend(ErrorString*, long callId, const String& jsonResult);
</ins><span class="cx"> 
</span><del>-    void setUserAgentOverride(ErrorString* error, const String& userAgent);
</del><ins>+    void setUserAgentOverride(ErrorString*, const String& userAgent);
</ins><span class="cx">     void applyUserAgentOverride(String* userAgent) const;
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp        2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp   2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -231,16 +231,18 @@
</span><span class="cx">     return responseObject;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static unsigned long frameId(Frame* frame)
</del><ins>+static String pointerAsId(void* pointer)
</ins><span class="cx"> {
</span><del>-    return reinterpret_cast<uintptr_t>(frame);
</del><ins>+    unsigned long long address = reinterpret_cast<uintptr_t>(pointer);
+    // We want 0 to be "", so that JavaScript checks for if (frameId) worked.
+    return String::format("%.0llX", address);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static PassRefPtr<InspectorObject> buildObjectForDocumentLoader(DocumentLoader* loader)
</span><span class="cx"> {
</span><span class="cx">     RefPtr<InspectorObject> documentLoaderObject = InspectorObject::create();
</span><del>-    documentLoaderObject->setNumber("frameId", frameId(loader->frame()));
-    documentLoaderObject->setNumber("loaderId", reinterpret_cast<uintptr_t>(loader));
</del><ins>+    documentLoaderObject->setString("frameId", pointerAsId(loader->frame()));
+    documentLoaderObject->setString("loaderId", pointerAsId(loader));
</ins><span class="cx">     documentLoaderObject->setString("url", loader->requestURL().string());
</span><span class="cx">     return documentLoaderObject;
</span><span class="cx"> }
</span><span class="lines">@@ -410,8 +412,8 @@
</span><span class="cx"> static PassRefPtr<InspectorObject> buildObjectForFrame(Frame* frame)
</span><span class="cx"> {
</span><span class="cx">     RefPtr<InspectorObject> frameObject = InspectorObject::create();
</span><del>-    frameObject->setNumber("id", frameId(frame));
-    frameObject->setNumber("parentId", frameId(frame->tree()->parent()));
</del><ins>+    frameObject->setString("id", pointerAsId(frame));
+    frameObject->setString("parentId", pointerAsId(frame->tree()->parent()));
</ins><span class="cx">     if (frame->ownerElement()) {
</span><span class="cx">         String name = frame->ownerElement()->getAttribute(HTMLNames::nameAttr);
</span><span class="cx">         if (name.isEmpty())
</span><span class="lines">@@ -446,7 +448,7 @@
</span><span class="cx"> 
</span><span class="cx"> void InspectorResourceAgent::frameDetachedFromParent(Frame* frame)
</span><span class="cx"> {
</span><del>-    m_frontend->frameDetachedFromParent(frameId(frame));
</del><ins>+    m_frontend->frameDetachedFromParent(pointerAsId(frame));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="lines">@@ -499,11 +501,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(WEB_SOCKETS)
</span><span class="cx"> 
</span><del>-Frame* InspectorResourceAgent::frameForId(unsigned long frameId)
</del><ins>+Frame* InspectorResourceAgent::frameForId(const String& frameId)
</ins><span class="cx"> {
</span><span class="cx">     Frame* mainFrame = m_page->mainFrame();
</span><span class="cx">     for (Frame* frame = mainFrame; frame; frame = frame->tree()->traverseNext(mainFrame)) {
</span><del>-        if (reinterpret_cast<uintptr_t>(frame) == frameId)
</del><ins>+        if (pointerAsId(frame) == frameId)
</ins><span class="cx">             return frame;
</span><span class="cx">     }
</span><span class="cx">     return 0;
</span><span class="lines">@@ -529,7 +531,7 @@
</span><span class="cx">     m_instrumentingAgents->setInspectorResourceAgent(0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorResourceAgent::resourceContent(ErrorString*, unsigned long frameId, const String& url, bool base64Encode, bool* success, String* content)
</del><ins>+void InspectorResourceAgent::resourceContent(ErrorString*, const String& frameId, const String& url, bool base64Encode, bool* success, String* content)
</ins><span class="cx"> {
</span><span class="cx">     Frame* frame = frameForId(frameId);
</span><span class="cx">     if (!frame) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.h (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.h  2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.h     2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -107,12 +107,12 @@
</span><span class="cx">     void didCloseWebSocket(unsigned long identifier);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    Frame* frameForId(unsigned long);
</del><ins>+    Frame* frameForId(const String& frameId);
</ins><span class="cx"> 
</span><span class="cx">     // Called from frontend 
</span><span class="cx">     void enable(ErrorString*, RefPtr<InspectorObject>*);
</span><span class="cx">     void disable(ErrorString*);
</span><del>-    void resourceContent(ErrorString*, unsigned long frameId, const String& url, bool base64Encode, bool* resourceFound, String* content);
</del><ins>+    void resourceContent(ErrorString*, const String& frameId, const String& url, bool base64Encode, bool* resourceFound, String* content);
</ins><span class="cx">     void setExtraHeaders(ErrorString*, PassRefPtr<InspectorObject>);
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorfrontendResourcesPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js (81570 => 81571)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js       2011-03-21 07:42:31 UTC (rev 81570)
+++ trunk/Source/WebCore/inspector/front-end/ResourcesPanel.js  2011-03-21 07:44:51 UTC (rev 81571)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> 
</span><span class="cx">         var parentTreeElement = parentFrameId ? this._treeElementForFrameId[parentFrameId] : this.resourcesListTreeElement;
</span><span class="cx">         if (!parentTreeElement) {
</span><del>-            console.warning("No frame with id:" + parentFrameId + " to route " + displayName + " to.")
</del><ins>+            console.warn("No frame with id:" + parentFrameId + " to route " + title + "/" + subtitle + " to.")
</ins><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>