Changeset 148769 in webkit

Timestamp:

Apr 19, 2013 2:06:06 PM (11 years ago)

Author:

Joseph Pecoraro

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (2 diffs)
• inspector/InspectorPageAgent.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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  <pecoraro@apple.com>
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -633 +633 @@
 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()) {
@@ -642 +643 @@
                 if (!sourceMapHeader.isEmpty())
                     return sourceMapHeader;
+
+                sourceMapHeader = resource->response().httpHeaderField(sourceMapHTTPHeaderDeprecated);
+                if (!sourceMapHeader.isEmpty())
+                    return sourceMapHeader;                
             }
         }

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -271 +271 @@
 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)
@@ -281 +282 @@
 
     String sourceMapHeader = cachedResource->response().httpHeaderField(sourceMapHTTPHeader);
+    if (!sourceMapHeader.isEmpty())
+        return sourceMapHeader;
+
+    sourceMapHeader = cachedResource->response().httpHeaderField(sourceMapHTTPHeaderDeprecated);
     if (!sourceMapHeader.isEmpty())
         return sourceMapHeader;