<!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>[165505] tags/Safari-537.75.8/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/165505">165505</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 16:12:01 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/165331">r165331</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/165427">r165427</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari537758SourceWebCoreChangeLog">tags/Safari-537.75.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari537758SourceWebCoreinspectorInspectorjson">tags/Safari-537.75.8/Source/WebCore/inspector/Inspector.json</a></li>
<li><a href="#tagsSafari537758SourceWebCoreinspectorInspectorPageAgentcpp">tags/Safari-537.75.8/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#tagsSafari537758SourceWebCoreinspectorInspectorResourceAgentcpp">tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#tagsSafari537758SourceWebCoreinspectorInspectorResourceAgenth">tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.h</a></li>
<li><a href="#tagsSafari537758SourceWebCoreloaderFrameLoadercpp">tags/Safari-537.75.8/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#tagsSafari537758SourceWebCoreloadercacheCachedResourceLoadercpp">tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#tagsSafari537758SourceWebCoreloadercacheCachedResourceLoaderh">tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.h</a></li>
<li><a href="#tagsSafari537758SourceWebCoreplatformnetworkResourceRequestBaseh">tags/Safari-537.75.8/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#tagsSafari537758SourceWebCorexmlXMLHttpRequestcpp">tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#tagsSafari537758SourceWebCorexmlXMLHttpRequesth">tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.h</a></li>
<li><a href="#tagsSafari537758SourceWebInspectorUIChangeLog">tags/Safari-537.75.8/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#tagsSafari537758SourceWebInspectorUIUserInterfaceInspectorBackendCommandsjs">tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js</a></li>
<li><a href="#tagsSafari537758SourceWebInspectorUIUserInterfaceSourceMapManagerjs">tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapManager.js</a></li>
<li><a href="#tagsSafari537758SourceWebInspectorUIUserInterfaceSourceMapResourcejs">tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapResource.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari537758SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/ChangeLog (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/ChangeLog 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/ChangeLog 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2014-03-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r165331.
+
+ 2014-03-10 Timothy Hatcher <timothy@apple.com>
+
+ Load source maps and their resources asynchronously.
+
+ https://bugs.webkit.org/show_bug.cgi?id=112071
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::buildObjectForFrameTree):
+ Honor the hiddenFromInspector flag.
+
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ (WebCore::InspectorResourceAgent::markResourceAsCached):
+ (WebCore::InspectorResourceAgent::didReceiveResponse):
+ (WebCore::InspectorResourceAgent::didReceiveData):
+ (WebCore::InspectorResourceAgent::didFinishLoading):
+ (WebCore::InspectorResourceAgent::didFailLoading):
+ (WebCore::InspectorResourceAgent::replayXHR):
+ (WebCore::InspectorResourceAgent::loadResource):
+ * inspector/InspectorResourceAgent.h:
+ Honor the hiddenFromInspector flag by keeping track of
+ hidden identifiers in a HashSet.
+
+ * inspector/protocol/Network.json:
+ (Network.loadResource): Added.
+
+ * platform/network/ResourceRequestBase.h:
+ (WebCore::ResourceRequestBase::hiddenFromInspector): Added.
+ (WebCore::ResourceRequestBase::setHiddenFromInspector): Added.
+ (WebCore::ResourceRequestBase::ResourceRequestBase):
+ Add a flag to hide the request from the Inspector.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::XMLHttpRequest):
+ (WebCore::XMLHttpRequest::sendForInspector): Added.
+ (WebCore::XMLHttpRequest::sendForInspectorXHRReplay): Renamed.
+ (WebCore::XMLHttpRequest::createRequest):
+ * xml/XMLHttpRequest.h:
+ Make Inspector loads allow cross-origins and hide their request
+ from the Inspector itself.
+
</ins><span class="cx"> 2014-03-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Build fix after r165379.
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreinspectorInspectorjson"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/inspector/Inspector.json (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/inspector/Inspector.json 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/inspector/Inspector.json 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -1001,6 +1001,19 @@
</span><span class="cx"> { "name": "cacheDisabled", "type": "boolean", "description": "Cache disabled state." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Toggles ignoring cache for each request. If <code>true</code>, cache will not be used."
</span><ins>+ },
+ {
+ "name": "loadResource",
+ "async": true,
+ "parameters": [
+ { "name": "frameId", "$ref": "FrameId", "description": "Frame to load the resource from." },
+ { "name": "url", "type": "string", "description": "URL of the resource to load." }
+ ],
+ "returns": [
+ { "name": "content", "type": "string", "description": "Resource content." },
+ { "name": "mimeType", "type": "string", "description": "Resource mimeType." }
+ ],
+ "description": "Loads a resource in the context of a frame on the inspected page without cross origin checks."
</ins><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "events": [
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/inspector/InspectorPageAgent.cpp (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -540,6 +540,9 @@
</span><span class="cx"> for (CachedResourceLoader::DocumentResourceMap::const_iterator it = allResources.begin(); it != end; ++it) {
</span><span class="cx"> CachedResource* cachedResource = it->value.get();
</span><span class="cx">
</span><ins>+ if (cachedResource->resourceRequest().hiddenFromInspector())
+ continue;
+
</ins><span class="cx"> switch (cachedResource->type()) {
</span><span class="cx"> case CachedResource::ImageResource:
</span><span class="cx"> // Skip images that were not auto loaded (images disabled in the user agent).
</span><span class="lines">@@ -566,8 +569,12 @@
</span><span class="cx"> result.append(frame->loader()->documentLoader()->url());
</span><span class="cx">
</span><span class="cx"> Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
</span><del>- for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it)
- result.append((*it)->url());
</del><ins>+ for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
+ CachedResource* cachedResource = *it;
+ if (cachedResource->resourceRequest().hiddenFromInspector())
+ continue;
+ result.append(cachedResource->url());
+ }
</ins><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -705,6 +712,10 @@
</span><span class="cx"> Vector<CachedResource*> allResources = cachedResourcesForFrame(frame);
</span><span class="cx"> for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
</span><span class="cx"> CachedResource* cachedResource = *it;
</span><ins>+
+ if (cachedResource->resourceRequest().hiddenFromInspector())
+ continue;
+
</ins><span class="cx"> if (textContentForCachedResource(cachedResource, &content)) {
</span><span class="cx"> int matchesCount = ContentSearchUtils::countRegularExpressionMatches(regex, content);
</span><span class="cx"> if (matchesCount)
</span><span class="lines">@@ -1130,6 +1141,9 @@
</span><span class="cx"> for (Vector<CachedResource*>::const_iterator it = allResources.begin(); it != allResources.end(); ++it) {
</span><span class="cx"> CachedResource* cachedResource = *it;
</span><span class="cx">
</span><ins>+ if (cachedResource->resourceRequest().hiddenFromInspector())
+ continue;
+
</ins><span class="cx"> RefPtr<TypeBuilder::Page::FrameResourceTree::Resources> resourceObject = TypeBuilder::Page::FrameResourceTree::Resources::create()
</span><span class="cx"> .setUrl(cachedResource->url())
</span><span class="cx"> .setType(cachedResourceTypeJson(*cachedResource))
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.cpp (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+typedef WebCore::InspectorBackendDispatcher::NetworkCommandHandler::LoadResourceCallback LoadResourceCallback;
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> namespace ResourceAgentState {
</span><span class="lines">@@ -193,6 +195,11 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::willSendRequest(unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& redirectResponse)
</span><span class="cx"> {
</span><ins>+ if (request.hiddenFromInspector()) {
+ m_hiddenRequestIdentifiers.add(identifier);
+ return;
+ }
+
</ins><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx"> m_resourcesData->resourceCreated(requestId, m_pageAgent->loaderId(loader));
</span><span class="cx">
</span><span class="lines">@@ -235,11 +242,17 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::markResourceAsCached(unsigned long identifier)
</span><span class="cx"> {
</span><ins>+ if (m_hiddenRequestIdentifiers.contains(identifier))
+ return;
+
</ins><span class="cx"> m_frontend->requestServedFromCache(IdentifiersFactory::requestId(identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveResponse(unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, ResourceLoader* resourceLoader)
</span><span class="cx"> {
</span><ins>+ if (m_hiddenRequestIdentifiers.contains(identifier))
+ return;
+
</ins><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx"> RefPtr<TypeBuilder::Network::Response> resourceResponse = buildObjectForResourceResponse(response, loader);
</span><span class="cx">
</span><span class="lines">@@ -284,6 +297,9 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength)
</span><span class="cx"> {
</span><ins>+ if (m_hiddenRequestIdentifiers.contains(identifier))
+ return;
+
</ins><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx">
</span><span class="cx"> if (data) {
</span><span class="lines">@@ -297,6 +313,12 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didFinishLoading(unsigned long identifier, DocumentLoader* loader, double finishTime)
</span><span class="cx"> {
</span><ins>+ auto hiddenResult = m_hiddenRequestIdentifiers.find(identifier);
+ if (hiddenResult != m_hiddenRequestIdentifiers.end()) {
+ m_hiddenRequestIdentifiers.remove(hiddenResult);
+ return;
+ }
+
</ins><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx"> if (m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
</span><span class="cx"> RefPtr<ResourceBuffer> buffer = loader->frameLoader()->documentLoader()->mainResourceData();
</span><span class="lines">@@ -318,6 +340,12 @@
</span><span class="cx">
</span><span class="cx"> void InspectorResourceAgent::didFailLoading(unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
</span><span class="cx"> {
</span><ins>+ auto hiddenResult = m_hiddenRequestIdentifiers.find(identifier);
+ if (hiddenResult != m_hiddenRequestIdentifiers.end()) {
+ m_hiddenRequestIdentifiers.remove(hiddenResult);
+ return;
+ }
+
</ins><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx">
</span><span class="cx"> if (m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource) {
</span><span class="lines">@@ -614,6 +642,7 @@
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> request.setCachePartition(m_pageAgent->mainFrame()->document()->topOrigin()->cachePartition());
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> CachedResource* cachedResource = memoryCache()->resourceForRequest(request);
</span><span class="cx"> if (cachedResource)
</span><span class="cx"> memoryCache()->remove(cachedResource);
</span><span class="lines">@@ -622,9 +651,91 @@
</span><span class="cx"> HTTPHeaderMap::const_iterator end = xhrReplayData->headers().end();
</span><span class="cx"> for (HTTPHeaderMap::const_iterator it = xhrReplayData->headers().begin(); it!= end; ++it)
</span><span class="cx"> xhr->setRequestHeader(it->key, it->value, IGNORE_EXCEPTION);
</span><del>- xhr->sendFromInspector(xhrReplayData->formData(), IGNORE_EXCEPTION);
</del><ins>+ xhr->sendForInspectorXHRReplay(xhrReplayData->formData(), IGNORE_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace {
+
+class LoadResourceListener : public EventListener {
+ WTF_MAKE_NONCOPYABLE(LoadResourceListener);
+public:
+ static PassRefPtr<LoadResourceListener> create(PassRefPtr<LoadResourceCallback> callback)
+ {
+ return adoptRef(new LoadResourceListener(callback));
+ }
+
+ virtual ~LoadResourceListener() { }
+
+ virtual bool operator==(const EventListener& other)
+ {
+ return this == &other;
+ }
+
+ virtual void handleEvent(ScriptExecutionContext*, Event* event)
+ {
+ if (!m_callback->isActive())
+ return;
+
+ if (event->type() == eventNames().errorEvent) {
+ m_callback->sendFailure(ASCIILiteral("Error loading resource"));
+ return;
+ }
+
+ if (event->type() != eventNames().readystatechangeEvent) {
+ m_callback->sendFailure(ASCIILiteral("Unexpected event type"));
+ return;
+ }
+
+ XMLHttpRequest* xhr = static_cast<XMLHttpRequest*>(event->target());
+ if (xhr->readyState() != XMLHttpRequest::DONE)
+ return;
+
+ m_callback->sendSuccess(xhr->responseText(IGNORE_EXCEPTION), xhr->responseMIMEType());
+ }
+
+private:
+ LoadResourceListener(PassRefPtr<LoadResourceCallback> callback)
+ : EventListener(EventListener::CPPEventListenerType)
+ , m_callback(callback) { }
+
+ RefPtr<LoadResourceCallback> m_callback;
+};
+
+} // namespace
+
+void InspectorResourceAgent::loadResource(ErrorString* errorString, const String& frameId, const String& urlString, PassRefPtr<LoadResourceCallback> callback)
+{
+ Frame* frame = m_pageAgent->assertFrame(errorString, frameId);
+ if (!frame)
+ return;
+
+ Document* document = frame->document();
+ if (!document) {
+ *errorString = ASCIILiteral("No Document instance for the specified frame");
+ return;
+ }
+
+ RefPtr<XMLHttpRequest> xhr = XMLHttpRequest::create(document);
+
+ ExceptionCode ec = 0;
+ xhr->open(ASCIILiteral("GET"), document->completeURL(urlString), ec);
+ if (ec) {
+ *errorString = ASCIILiteral("Error creating request");
+ return;
+ }
+
+ RefPtr<LoadResourceListener> loadResourceListener = LoadResourceListener::create(callback);
+ xhr->addEventListener(eventNames().abortEvent, loadResourceListener, false);
+ xhr->addEventListener(eventNames().errorEvent, loadResourceListener, false);
+ xhr->addEventListener(eventNames().readystatechangeEvent, loadResourceListener, false);
+ xhr->sendForInspector(ec);
+
+ if (ec) {
+ *errorString = ASCIILiteral("Error sending request");
+ return;
+ }
+}
+
</ins><span class="cx"> void InspectorResourceAgent::canClearBrowserCache(ErrorString*, bool* result)
</span><span class="cx"> {
</span><span class="cx"> *result = m_client->canClearBrowserCache();
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreinspectorInspectorResourceAgenth"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.h (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.h 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/inspector/InspectorResourceAgent.h 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "InspectorBaseAgent.h"
</span><span class="cx"> #include "InspectorFrontend.h"
</span><span class="cx">
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -151,6 +152,8 @@
</span><span class="cx"> virtual void clearBrowserCookies(ErrorString*);
</span><span class="cx"> virtual void setCacheDisabled(ErrorString*, bool cacheDisabled);
</span><span class="cx">
</span><ins>+ virtual void loadResource(ErrorString*, const String& frameId, const String& url, PassRefPtr<LoadResourceCallback>) override;
+
</ins><span class="cx"> private:
</span><span class="cx"> InspectorResourceAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*, InspectorCompositeState*);
</span><span class="cx">
</span><span class="lines">@@ -163,6 +166,8 @@
</span><span class="cx"> OwnPtr<NetworkResourcesData> m_resourcesData;
</span><span class="cx"> bool m_loadingXHRSynchronously;
</span><span class="cx">
</span><ins>+ HashSet<unsigned long> m_hiddenRequestIdentifiers;
+
</ins><span class="cx"> typedef HashMap<ThreadableLoaderClient*, RefPtr<XHRReplayData> > PendingXHRReplayDataMap;
</span><span class="cx"> PendingXHRReplayDataMap m_pendingXHRReplayData;
</span><span class="cx"> // FIXME: InspectorResourceAgent should now be aware of style recalculation.
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/loader/FrameLoader.cpp (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/loader/FrameLoader.cpp 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/loader/FrameLoader.cpp 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -2943,8 +2943,6 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::loadedResourceFromMemoryCache(CachedResource* resource, ResourceRequest& newRequest)
</span><span class="cx"> {
</span><del>- newRequest = ResourceRequest(resource->url());
-
</del><span class="cx"> Page* page = m_frame->page();
</span><span class="cx"> if (!page)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -418,12 +418,16 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource* resource)
</del><ins>+bool CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest& request, CachedResource* resource)
</ins><span class="cx"> {
</span><span class="cx"> if (!resource || !frame() || resource->status() != CachedResource::Cached)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- ResourceRequest newRequest;
</del><ins>+ ResourceRequest newRequest = ResourceRequest(resource->url());
+#if ENABLE(INSPECTOR)
+ if (request.resourceRequest().hiddenFromInspector())
+ newRequest.setHiddenFromInspector(true);
+#endif
</ins><span class="cx"> frame()->loader()->loadedResourceFromMemoryCache(resource, newRequest);
</span><span class="cx">
</span><span class="cx"> // FIXME <http://webkit.org/b/113251>: If the delegate modifies the request's
</span><span class="lines">@@ -478,7 +482,7 @@
</span><span class="cx"> resource = revalidateResource(request, resource.get());
</span><span class="cx"> break;
</span><span class="cx"> case Use:
</span><del>- if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(resource.get()))
</del><ins>+ if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(request, resource.get()))
</ins><span class="cx"> return 0;
</span><span class="cx"> memoryCache()->resourceAccessed(resource.get());
</span><span class="cx"> break;
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreloadercacheCachedResourceLoaderh"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.h (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/loader/cache/CachedResourceLoader.h 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> enum RevalidationPolicy { Use, Revalidate, Reload, Load };
</span><span class="cx"> RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, ResourceRequest&, bool forPreload, CachedResource* existingResource, CachedResourceRequest::DeferOption) const;
</span><span class="cx">
</span><del>- bool shouldContinueAfterNotifyingLoadedFromMemoryCache(CachedResource*);
</del><ins>+ bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
</ins><span class="cx"> bool checkInsecureContent(CachedResource::Type, const KURL&) const;
</span><span class="cx">
</span><span class="cx"> void garbageCollectDocumentResourcesTimerFired(Timer<CachedResourceLoader>*);
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/platform/network/ResourceRequestBase.h (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/platform/network/ResourceRequestBase.h 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/platform/network/ResourceRequestBase.h 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -139,6 +139,12 @@
</span><span class="cx"> bool reportRawHeaders() const { return m_reportRawHeaders; }
</span><span class="cx"> void setReportRawHeaders(bool reportRawHeaders) { m_reportRawHeaders = reportRawHeaders; }
</span><span class="cx">
</span><ins>+#if ENABLE(INSPECTOR)
+ // Whether this request should be hidden from the Inspector.
+ bool hiddenFromInspector() const { return m_hiddenFromInspector; }
+ void setHiddenFromInspector(bool hiddenFromInspector) { m_hiddenFromInspector = hiddenFromInspector; }
+#endif
+
</ins><span class="cx"> static double defaultTimeoutInterval(); // May return 0 when using platform default.
</span><span class="cx"> static void setDefaultTimeoutInterval(double);
</span><span class="cx">
</span><span class="lines">@@ -154,6 +160,9 @@
</span><span class="cx"> , m_reportUploadProgress(false)
</span><span class="cx"> , m_reportLoadTiming(false)
</span><span class="cx"> , m_reportRawHeaders(false)
</span><ins>+#if ENABLE(INSPECTOR)
+ , m_hiddenFromInspector(false)
+#endif
</ins><span class="cx"> , m_priority(ResourceLoadPriorityLow)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -171,6 +180,9 @@
</span><span class="cx"> , m_reportUploadProgress(false)
</span><span class="cx"> , m_reportLoadTiming(false)
</span><span class="cx"> , m_reportRawHeaders(false)
</span><ins>+#if ENABLE(INSPECTOR)
+ , m_hiddenFromInspector(false)
+#endif
</ins><span class="cx"> , m_priority(ResourceLoadPriorityLow)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -198,6 +210,9 @@
</span><span class="cx"> bool m_reportUploadProgress : 1;
</span><span class="cx"> bool m_reportLoadTiming : 1;
</span><span class="cx"> bool m_reportRawHeaders : 1;
</span><ins>+#if ENABLE(INSPECTOR)
+ bool m_hiddenFromInspector : 1;
+#endif
</ins><span class="cx"> ResourceLoadPriority m_priority;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.cpp (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.cpp 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.cpp 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -186,6 +186,7 @@
</span><span class="cx"> , m_uploadEventsAllowed(true)
</span><span class="cx"> , m_uploadComplete(false)
</span><span class="cx"> , m_sameOriginRequest(true)
</span><ins>+ , m_sendingForInspector(false)
</ins><span class="cx"> , m_receivedLength(0)
</span><span class="cx"> , m_lastSendLineNumber(0)
</span><span class="cx"> , m_exceptionCode(0)
</span><span class="lines">@@ -727,8 +728,14 @@
</span><span class="cx"> createRequest(ec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void XMLHttpRequest::sendFromInspector(PassRefPtr<FormData> formData, ExceptionCode& ec)
</del><ins>+void XMLHttpRequest::sendForInspector(ExceptionCode& ec)
</ins><span class="cx"> {
</span><ins>+ m_sendingForInspector = true;
+ send(ec);
+}
+
+void XMLHttpRequest::sendForInspectorXHRReplay(PassRefPtr<FormData> formData, ExceptionCode& ec)
+{
</ins><span class="cx"> m_requestEntityBody = formData ? formData->deepCopy() : 0;
</span><span class="cx"> createRequest(ec);
</span><span class="cx"> m_exceptionCode = ec;
</span><span class="lines">@@ -764,6 +771,9 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(m_url);
</span><span class="cx"> request.setHTTPMethod(m_method);
</span><ins>+#if ENABLE(INSPECTOR)
+ request.setHiddenFromInspector(m_sendingForInspector);
+#endif
</ins><span class="cx"> #if PLATFORM(BLACKBERRY)
</span><span class="cx"> request.setTargetType(ResourceRequest::TargetIsXHR);
</span><span class="cx"> #endif
</span><span class="lines">@@ -784,7 +794,7 @@
</span><span class="cx"> options.sniffContent = DoNotSniffContent;
</span><span class="cx"> options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight;
</span><span class="cx"> options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</span><del>- options.crossOriginRequestPolicy = UseAccessControl;
</del><ins>+ options.crossOriginRequestPolicy = m_sendingForInspector ? AllowCrossOriginRequests : UseAccessControl;
</ins><span class="cx"> options.securityOrigin = securityOrigin();
</span><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span><span class="cx"> options.initiator = cachedResourceRequestInitiators().xmlhttprequest;
</span></span></pre></div>
<a id="tagsSafari537758SourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.h (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.h 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebCore/xml/XMLHttpRequest.h 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> String getAllResponseHeaders(ExceptionCode&) const;
</span><span class="cx"> String getResponseHeader(const AtomicString& name, ExceptionCode&) const;
</span><span class="cx"> String responseText(ExceptionCode&);
</span><ins>+ String responseMIMEType() const;
</ins><span class="cx"> Document* responseXML(ExceptionCode&);
</span><span class="cx"> Document* optionalResponseXML() const { return m_responseDocument.get(); }
</span><span class="cx"> Blob* responseBlob(ExceptionCode&);
</span><span class="lines">@@ -113,7 +114,8 @@
</span><span class="cx"> void setTimeout(unsigned long timeout, ExceptionCode&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void sendFromInspector(PassRefPtr<FormData>, ExceptionCode&);
</del><ins>+ void sendForInspector(ExceptionCode&);
+ void sendForInspectorXHRReplay(PassRefPtr<FormData>, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> // Expose HTTP validation methods for other untrusted requests.
</span><span class="cx"> static bool isAllowedHTTPMethod(const String&);
</span><span class="lines">@@ -170,7 +172,6 @@
</span><span class="cx"> virtual void didFail(const ResourceError&);
</span><span class="cx"> virtual void didFailRedirectCheck();
</span><span class="cx">
</span><del>- String responseMIMEType() const;
</del><span class="cx"> bool responseIsXML() const;
</span><span class="cx">
</span><span class="cx"> bool initSend(ExceptionCode&);
</span><span class="lines">@@ -228,6 +229,7 @@
</span><span class="cx"> bool m_uploadComplete;
</span><span class="cx">
</span><span class="cx"> bool m_sameOriginRequest;
</span><ins>+ bool m_sendingForInspector;
</ins><span class="cx">
</span><span class="cx"> // Used for onprogress tracking
</span><span class="cx"> long long m_receivedLength;
</span></span></pre></div>
<a id="tagsSafari537758SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebInspectorUI/ChangeLog (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebInspectorUI/ChangeLog 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebInspectorUI/ChangeLog 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2014-03-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r165427.
+
+ 2014-03-10 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Frontend loaded resources from cache are not hidden as expected
+ https://bugs.webkit.org/show_bug.cgi?id=130044
+
+ Reviewed by Timothy Hatcher.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadedResourceFromMemoryCache):
+ Use the new request that was passed in. Assume it is filled in appropriately.
+
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
+ Carry over the hidden from inspector state if the passed in request had it,
+ and create the request that loadedResourceFromMemoryCache will use.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+ Add missing ifdefs for INSPECTOR only function.
+
+2014-03-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r165331.
+
+ 2014-03-10 Timothy Hatcher <timothy@apple.com>
+
+ Load source maps and their resources asynchronously.
+
+ https://bugs.webkit.org/show_bug.cgi?id=112071
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/SourceMapManager.js:
+ (WebInspector.SourceMapManager.prototype.loadAndParseSourceMap):
+ (WebInspector.SourceMapManager.prototype.downloadSourceMap):
+ (WebInspector.SourceMapManager.prototype.sourceMapLoaded):
+ (WebInspector.SourceMapManager.prototype._loadAndParseSourceMap):
+ Use NetworkAgent.loadResource.
+
+ * UserInterface/SourceMapResource.js:
+ (WebInspector.SourceMapResource.prototype.requestContentFromBackend.sourceMapResourceLoaded):
+ (WebInspector.SourceMapResource.prototype.createSourceCodeTextRange):
+ Use NetworkAgent.loadResource.
+
+ * UserInterface/InspectorWebBackendCommands.js: Updated.
+
</ins><span class="cx"> 2014-03-10 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165393.
</span></span></pre></div>
<a id="tagsSafari537758SourceWebInspectorUIUserInterfaceInspectorBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx">
</span><span class="cx"> // Memory.
</span><span class="cx"> InspectorBackend.registerMemoryDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Memory");
</span><del>-InspectorBackend.registerEvent("Memory.addNativeSnapshotChunk", ["chunk"]);
</del><span class="cx"> InspectorBackend.registerCommand("Memory.getDOMCounters", [], ["documents", "nodes", "jsEventListeners"]);
</span><span class="cx">
</span><span class="cx"> // Page.
</span><span class="lines">@@ -131,6 +130,7 @@
</span><span class="cx"> InspectorBackend.registerCommand("Network.canClearBrowserCookies", [], ["result"]);
</span><span class="cx"> InspectorBackend.registerCommand("Network.clearBrowserCookies", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Network.setCacheDisabled", [{"name": "cacheDisabled", "type": "boolean", "optional": false}], []);
</span><ins>+InspectorBackend.registerCommand("Network.loadResource", [{"name": "frameId", "type": "string", "optional": false}, {"name": "url", "type": "string", "optional": false}], ["content", "mimeType"]);
</ins><span class="cx">
</span><span class="cx"> // Database.
</span><span class="cx"> InspectorBackend.registerDatabaseDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Database");
</span><span class="lines">@@ -401,3 +401,5 @@
</span><span class="cx"> InspectorBackend.registerCommand("LayerTree.disable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("LayerTree.layersForNode", [{"name": "nodeId", "type": "number", "optional": false}], ["layers"]);
</span><span class="cx"> InspectorBackend.registerCommand("LayerTree.reasonsForCompositingLayer", [{"name": "layerId", "type": "string", "optional": false}], ["compositingReasons"]);
</span><ins>+
+
</ins></span></pre></div>
<a id="tagsSafari537758SourceWebInspectorUIUserInterfaceSourceMapManagerjs"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapManager.js (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapManager.js 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapManager.js 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -61,7 +61,19 @@
</span><span class="cx"> if (sourceMapURL in this._downloadingSourceMaps)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._loadAndParseSourceMap(sourceMapURL, baseURL, originalSourceCode);
</del><ins>+ function loadAndParseSourceMap()
+ {
+ this._loadAndParseSourceMap(sourceMapURL, baseURL, originalSourceCode);
+ }
+
+ if (!WebInspector.frameResourceManager.mainFrame) {
+ // If we don't have a main frame, then we are likely in the middle of building the resource tree.
+ // Delaying until the next runloop is enough in this case to then start loading the source map.
+ setTimeout(loadAndParseSourceMap.bind(this), 0);
+ return;
+ }
+
+ loadAndParseSourceMap.call(this);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Private
</span><span class="lines">@@ -70,31 +82,48 @@
</span><span class="cx"> {
</span><span class="cx"> this._downloadingSourceMaps[sourceMapURL] = true;
</span><span class="cx">
</span><del>- // FIXME: <rdar://problem/13238886> Source Maps: Frontend needs asynchronous resource loading of content + mime type
- var response = InspectorFrontendHost.loadResourceSynchronously(sourceMapURL);
- if (response === undefined) {
</del><ins>+ // COMPATIBILITY (iOS 6 & 7): NetworkAgent.loadResource does not exist.
+ // We can't load the source map on those iOS versions.
+ if (!NetworkAgent.loadResource) {
</ins><span class="cx"> this._loadAndParseFailed(sourceMapURL);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (response.slice(0, 3) === ")]}") {
- var firstNewlineIndex = response.indexOf("\n");
- if (firstNewlineIndex === -1) {
</del><ins>+ function sourceMapLoaded(error, content, mimeType)
+ {
+ if (error) {
</ins><span class="cx"> this._loadAndParseFailed(sourceMapURL);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- response = response.substring(firstNewlineIndex);
</del><ins>+
+ if (content.slice(0, 3) === ")]}") {
+ var firstNewlineIndex = content.indexOf("\n");
+ if (firstNewlineIndex === -1) {
+ this._loadAndParseFailed(sourceMapURL);
+ return;
+ }
+
+ content = content.substring(firstNewlineIndex);
+ }
+
+ try {
+ var payload = JSON.parse(content);
+ var baseURL = sourceMapURL.startsWith("data:") ? originalSourceCode.url : sourceMapURL;
+ var sourceMap = new WebInspector.SourceMap(baseURL, payload, originalSourceCode);
+ this._loadAndParseSucceeded(sourceMapURL, sourceMap);
+ } catch(e) {
+ this._loadAndParseFailed(sourceMapURL);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- try {
- var payload = JSON.parse(response);
- var baseURL = sourceMapURL.startsWith("data:") ? originalSourceCode.url : sourceMapURL;
- var sourceMap = new WebInspector.SourceMap(baseURL, payload, originalSourceCode);
- this._loadAndParseSucceeded(sourceMapURL, sourceMap);
- } catch(e) {
- console.error(e.message);
- this._loadAndParseFailed(sourceMapURL);
- }
</del><ins>+ var frameIdentifier = null;
+ if (originalSourceCode instanceof WebInspector.Resource && originalSourceCode.parentFrame)
+ frameIdentifier = originalSourceCode.parentFrame.id;
+
+ if (!frameIdentifier)
+ frameIdentifier = WebInspector.frameResourceManager.mainFrame.id;
+
+ NetworkAgent.loadResource(frameIdentifier, sourceMapURL, sourceMapLoaded.bind(this));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _loadAndParseFailed: function(sourceMapURL)
</span></span></pre></div>
<a id="tagsSafari537758SourceWebInspectorUIUserInterfaceSourceMapResourcejs"></a>
<div class="modfile"><h4>Modified: tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapResource.js (165504 => 165505)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapResource.js 2014-03-12 23:00:24 UTC (rev 165504)
+++ tags/Safari-537.75.8/Source/WebInspectorUI/UserInterface/SourceMapResource.js 2014-03-12 23:12:01 UTC (rev 165505)
</span><span class="lines">@@ -62,22 +62,51 @@
</span><span class="cx">
</span><span class="cx"> canRequestContentFromBackend: function()
</span><span class="cx"> {
</span><del>- return !this.finished;
</del><ins>+ // COMPATIBILITY (iOS 6 & 7): NetworkAgent.loadResource does not exist.
+ // We shouldn't get here, but just to be safe.
+ return !this.finished || !NetworkAgent.loadResource;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> requestContentFromBackend: function(callback)
</span><span class="cx"> {
</span><del>- function requestAsyncCallback(body, base64encoded, mimeType)
</del><ins>+ // COMPATIBILITY (iOS 6 & 7): NetworkAgent.loadResource does not exist.
+ // We shouldn't get here, but just to be safe.
+ console.assert(NetworkAgent.loadResource);
+ if (!NetworkAgent.loadResource)
+ return false;
+
+ var inlineContent = this._sourceMap.sourceContent(this.url);
+ if (inlineContent) {
+ // Force inline content to be asynchronous to match the expected load pattern.
+ setTimeout(function() {
+ // FIXME: We don't know the MIME-type for inline content. Guess by analyzing the content?
+ // Guess by using the type of the original resource?
+ sourceMapResourceLoaded.call(this, null, inlineContent, "text/javascript");
+ }.bind(this));
+
+ return true;
+ }
+
+ function sourceMapResourceLoaded(error, body, mimeType)
</ins><span class="cx"> {
</span><del>- if (body === null) {
</del><ins>+ const base64encoded = false;
+
+ if (error) {
</ins><span class="cx"> this.markAsFailed();
</span><del>- callback("Failed to load resource", body, base64encoded);
</del><ins>+ callback(error, body, base64encoded);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ var fileExtension = WebInspector.fileExtensionForURL(this.url);
+ var fileExtensionMIMEType = WebInspector.mimeTypeForFileExtension(fileExtension, true) || "text/javascript";
+
+ // FIXME: Add support for picking the best MIME-type. Right now the file extension is the best bet.
+ mimeType = fileExtensionMIMEType;
+
</ins><span class="cx"> var oldType = this._type;
</span><span class="cx"> var oldMIMEType = this._mimeType;
</span><span class="cx">
</span><ins>+ // FIXME: This is a layering violation. It should use a helper function on the Resource base-class.
</ins><span class="cx"> this._mimeType = mimeType;
</span><span class="cx"> this._type = WebInspector.Resource.Type.fromMIMEType(this._mimeType);
</span><span class="cx">
</span><span class="lines">@@ -92,7 +121,15 @@
</span><span class="cx"> callback(null, body, base64encoded);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this._requestResourceAsynchronously(requestAsyncCallback.bind(this));
</del><ins>+ var frameIdentifier = null;
+ if (this._sourceMap.originalSourceCode instanceof WebInspector.Resource && this._sourceMap.originalSourceCode.parentFrame)
+ frameIdentifier = this._sourceMap.originalSourceCode.parentFrame.id;
+
+ if (!frameIdentifier)
+ frameIdentifier = WebInspector.frameResourceManager.mainFrame.id;
+
+ NetworkAgent.loadResource(frameIdentifier, this.url, sourceMapResourceLoaded.bind(this));
+
</ins><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -124,25 +161,6 @@
</span><span class="cx"> var startSourceCodeLocation = this.createSourceCodeLocation(textRange.startLine, textRange.startColumn);
</span><span class="cx"> var endSourceCodeLocation = this.createSourceCodeLocation(textRange.endLine, textRange.endColumn);
</span><span class="cx"> return new WebInspector.SourceCodeTextRange(this._sourceMap.originalSourceCode, startSourceCodeLocation, endSourceCodeLocation);
</span><del>- },
-
- // Private
-
- _requestResourceAsynchronously: function(callback)
- {
- // FIXME: <rdar://problem/13238886> Source Maps: Frontend needs asynchronous resource loading of content + mime type
-
- function async()
- {
- var body = this._sourceMap.sourceContent(this.url) || InspectorFrontendHost.loadResourceSynchronously(this.url);
- if (body === undefined)
- body = null;
- var fileExtension = WebInspector.fileExtensionForURL(this.url);
- var mimeType = WebInspector.mimeTypeForFileExtension(fileExtension, true) || "text/javascript";
- callback(body, false, mimeType);
- }
-
- setTimeout(async.bind(this), 0);
</del><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>