Title: [148769] trunk/Source/WebCore
- Revision
- 148769
- Author
- [email protected]
- Date
- 2013-04-19 14:06:06 -0700 (Fri, 19 Apr 2013)
Log Message
Web Inspector: Support the SourceMap header, X-SourceMap was deprecated
https://bugs.webkit.org/show_bug.cgi?id=114888
Check first for SourceMap, then fallback to X-SourceMap. Leaving in
support for the deprecated header because most tools and articles
online mention that version and have not yet updated.
Reviewed by Timothy Hatcher.
* inspector/InspectorDebuggerAgent.cpp:
(WebCore::InspectorDebuggerAgent::sourceMapURLForScript):
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::sourceMapURLForResource):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148768 => 148769)
--- trunk/Source/WebCore/ChangeLog 2013-04-19 21:06:03 UTC (rev 148768)
+++ trunk/Source/WebCore/ChangeLog 2013-04-19 21:06:06 UTC (rev 148769)
@@ -1,5 +1,21 @@
2013-04-19 Joseph Pecoraro <[email protected]>
+ Web Inspector: Support the SourceMap header, X-SourceMap was deprecated
+ https://bugs.webkit.org/show_bug.cgi?id=114888
+
+ Check first for SourceMap, then fallback to X-SourceMap. Leaving in
+ support for the deprecated header because most tools and articles
+ online mention that version and have not yet updated.
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorDebuggerAgent.cpp:
+ (WebCore::InspectorDebuggerAgent::sourceMapURLForScript):
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::sourceMapURLForResource):
+
+2013-04-19 Joseph Pecoraro <[email protected]>
+
Web Inspector: Backend should detect sourceMappingURLs in CSS Resources
https://bugs.webkit.org/show_bug.cgi?id=114854
Modified: trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp (148768 => 148769)
--- trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-04-19 21:06:03 UTC (rev 148768)
+++ trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp 2013-04-19 21:06:06 UTC (rev 148769)
@@ -632,7 +632,8 @@
String InspectorDebuggerAgent::sourceMapURLForScript(const Script& script)
{
- DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeader, (ASCIILiteral("X-SourceMap")));
+ DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeader, (ASCIILiteral("SourceMap")));
+ DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeaderDeprecated, (ASCIILiteral("X-SourceMap")));
if (!script.url.isEmpty()) {
if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgent()) {
@@ -641,6 +642,10 @@
String sourceMapHeader = resource->response().httpHeaderField(sourceMapHTTPHeader);
if (!sourceMapHeader.isEmpty())
return sourceMapHeader;
+
+ sourceMapHeader = resource->response().httpHeaderField(sourceMapHTTPHeaderDeprecated);
+ if (!sourceMapHeader.isEmpty())
+ return sourceMapHeader;
}
}
}
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (148768 => 148769)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-04-19 21:06:03 UTC (rev 148768)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2013-04-19 21:06:06 UTC (rev 148769)
@@ -270,7 +270,8 @@
//static
String InspectorPageAgent::sourceMapURLForResource(CachedResource* cachedResource)
{
- DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeader, (ASCIILiteral("X-SourceMap")));
+ DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeader, (ASCIILiteral("SourceMap")));
+ DEFINE_STATIC_LOCAL(String, sourceMapHTTPHeaderDeprecated, (ASCIILiteral("X-SourceMap")));
if (!cachedResource)
return String();
@@ -283,6 +284,10 @@
if (!sourceMapHeader.isEmpty())
return sourceMapHeader;
+ sourceMapHeader = cachedResource->response().httpHeaderField(sourceMapHTTPHeaderDeprecated);
+ if (!sourceMapHeader.isEmpty())
+ return sourceMapHeader;
+
String content;
bool base64Encoded;
if (InspectorPageAgent::cachedResourceContent(cachedResource, &content, &base64Encoded) && !base64Encoded)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
