<!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>[165584] 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/165584">165584</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-13 18:11:15 -0700 (Thu, 13 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove InspectorFrontendHost.loadResourceSynchronously
https://bugs.webkit.org/show_bug.cgi?id=130217
Reviewed by Timothy Hatcher.
Source/WebCore:
This has been replaced by NetworkAgent.loadResource,
which loads asynchronously through the backend.
* inspector/InspectorFrontendHost.cpp:
* inspector/InspectorFrontendHost.h:
* inspector/InspectorFrontendHost.idl:
Source/WebInspectorUI:
* UserInterface/Protocol/InspectorFrontendHostStub.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostcpp">trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHosth">trunk/Source/WebCore/inspector/InspectorFrontendHost.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorFrontendHostidl">trunk/Source/WebCore/inspector/InspectorFrontendHost.idl</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendHostStubjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendHostStub.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Remove InspectorFrontendHost.loadResourceSynchronously
+ https://bugs.webkit.org/show_bug.cgi?id=130217
+
+ Reviewed by Timothy Hatcher.
+
+ This has been replaced by NetworkAgent.loadResource,
+ which loads asynchronously through the backend.
+
+ * inspector/InspectorFrontendHost.cpp:
+ * inspector/InspectorFrontendHost.h:
+ * inspector/InspectorFrontendHost.idl:
+
+2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Network.loadResource should include the response status code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130216
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.cpp 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -34,24 +34,20 @@
</span><span class="cx"> #include "InspectorFrontendHost.h"
</span><span class="cx">
</span><span class="cx"> #include "ContextMenu.h"
</span><del>-#include "ContextMenuItem.h"
</del><span class="cx"> #include "ContextMenuController.h"
</span><ins>+#include "ContextMenuItem.h"
</ins><span class="cx"> #include "ContextMenuProvider.h"
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><del>-#include "Element.h"
</del><ins>+#include "Document.h"
</ins><span class="cx"> #include "Event.h"
</span><del>-#include "FrameLoader.h"
</del><span class="cx"> #include "HitTestResult.h"
</span><del>-#include "HTMLFrameOwnerElement.h"
</del><span class="cx"> #include "InspectorFrontendClient.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MouseEvent.h"
</span><ins>+#include "Node.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><del>-#include "ResourceError.h"
-#include "ResourceRequest.h"
-#include "ResourceResponse.h"
</del><span class="cx"> #include "ScriptGlobalObject.h"
</span><span class="cx"> #include "ScriptState.h"
</span><span class="cx"> #include "Sound.h"
</span><span class="lines">@@ -301,18 +297,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String InspectorFrontendHost::loadResourceSynchronously(const String& url)
-{
- ResourceRequest request(url);
- request.setHTTPMethod("GET");
-
- Vector<char> data;
- ResourceError error;
- ResourceResponse response;
- m_frontendPage->mainFrame().loader().loadResourceSynchronously(request, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, error, response, data);
- return String::fromUTF8(data.data(), data.size());
-}
-
</del><span class="cx"> bool InspectorFrontendHost::isUnderTest()
</span><span class="cx"> {
</span><span class="cx"> return m_client && m_client->isUnderTest();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHosth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.h (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.h 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -6,13 +6,13 @@
</span><span class="cx"> * are met:
</span><span class="cx"> *
</span><span class="cx"> * 1. Redistributions of source code must retain the above copyright
</span><del>- * notice, this list of conditions and the following disclaimer.
</del><ins>+ * notice, this list of conditions and the following disclaimer.
</ins><span class="cx"> * 2. Redistributions in binary form must reproduce the above copyright
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><del>- * documentation and/or other materials provided with the distribution.
</del><ins>+ * documentation and/or other materials provided with the distribution.
</ins><span class="cx"> * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
</span><span class="cx"> * its contributors may be used to endorse or promote products derived
</span><del>- * from this software without specific prior written permission.
</del><ins>+ * from this software without specific prior written permission.
</ins><span class="cx"> *
</span><span class="cx"> * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx"> void sendMessageToBackend(const String& message);
</span><span class="cx"> void dispatchEventAsContextMenuEvent(Event*);
</span><span class="cx">
</span><del>- String loadResourceSynchronously(const String& url);
-
</del><span class="cx"> bool isUnderTest();
</span><span class="cx">
</span><span class="cx"> void beep();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorFrontendHostidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorFrontendHost.idl (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebCore/inspector/InspectorFrontendHost.idl 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -69,8 +69,6 @@
</span><span class="cx"> [Custom] void recordPanelShown(unsigned long panelCode);
</span><span class="cx"> [Custom] void recordSettingChanged(unsigned long settingChanged);
</span><span class="cx">
</span><del>- DOMString loadResourceSynchronously(DOMString url);
-
</del><span class="cx"> boolean isUnderTest();
</span><span class="cx">
</span><span class="cx"> void beep();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Remove InspectorFrontendHost.loadResourceSynchronously
+ https://bugs.webkit.org/show_bug.cgi?id=130217
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Protocol/InspectorFrontendHostStub.js:
+
+2014-03-13 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Network.loadResource should include the response status code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130216
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendHostStubjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendHostStub.js (165583 => 165584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendHostStub.js 2014-03-14 01:11:13 UTC (rev 165583)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendHostStub.js 2014-03-14 01:11:15 UTC (rev 165584)
</span><span class="lines">@@ -134,17 +134,6 @@
</span><span class="cx"> this._socket.send(message);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- loadResourceSynchronously: function(url)
- {
- var xhr = new XMLHttpRequest();
- xhr.open("GET", url, false);
- xhr.send(null);
-
- if (xhr.status === 200)
- return xhr.responseText;
- return null;
- },
-
</del><span class="cx"> platform: function()
</span><span class="cx"> {
</span><span class="cx"> return (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
</span></span></pre>
</div>
</div>
</body>
</html>