DevTools: Add support for //# sourceURL (sourceMappingURL) comments and deprecate //@ ones

Source/core/inspector/InspectorStyleSheet.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 37 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/html/HTMLHeadElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/inspector/ContentSearchUtils.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorValues.h"
 #include "core/page/ContentSecurityPolicy.h"
+#include "core/page/PageConsole.h"
 #include "core/platform/text/RegularExpression.h"
 
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/Vector.h>
 
 using WebCore::TypeBuilder::Array;
 using WebCore::RuleSourceDataList;
 using WebCore::CSSRuleSourceData;
@@ skipping 1410 matching lines @@
     if (!m_sourceURL.isNull())
         return m_sourceURL;
     if (m_origin != TypeBuilder::CSS::StyleSheetOrigin::Regular) {
         m_sourceURL = "";
         return m_sourceURL;
     }
 
     String styleSheetText;
     bool success = getText(&styleSheetText);
     if (success) {
-        String commentValue = ContentSearchUtils::findSourceURL(styleSheetText, ContentSearchUtils::CSSMagicComment);
+        bool deprecated;
+        String commentValue = ContentSearchUtils::findSourceURL(styleSheetText, ContentSearchUtils::CSSMagicComment, &deprecated);
         if (!commentValue.isEmpty()) {
+            if (deprecated)
+                m_pageAgent->page()->console()->addMessage(NetworkMessageSource, WarningMessageLevel, "\"/*@ sourceURL=\" source url declaration is deprecated, \"/*# sourceURL=\" declaration should be used instead.", finalURL(), 0);

[apavlov, 2013/05/29 13:58:05]

We need a kind of utility for this :(

             m_sourceURL = commentValue;
-            return m_sourceURL;
+            return commentValue;
         }
     }
     m_sourceURL = "";
     return m_sourceURL;
 }
 
 String InspectorStyleSheet::url() const
 {
     // "sourceURL" is present only for regular rules, otherwise "origin" should be used in the frontend.
     if (m_origin != TypeBuilder::CSS::StyleSheetOrigin::Regular)
@@ skipping 21 matching lines @@
 {
     CSSStyleSheet* styleSheet = pageStyleSheet();
     if (!styleSheet)
         return true;
 
     return styleSheet->startPositionInSource() == TextPosition::minimumPosition();
 }
 
 String InspectorStyleSheet::sourceMapURL() const
 {
-    DEFINE_STATIC_LOCAL(String, sourceMapHttpHeader, (ASCIILiteral("X-SourceMap")));
-
     if (m_origin != TypeBuilder::CSS::StyleSheetOrigin::Regular)
         return String();
 
     String styleSheetText;
     bool success = getText(&styleSheetText);
     if (success) {
-        String commentValue = ContentSearchUtils::findSourceMapURL(styleSheetText, ContentSearchUtils::CSSMagicComment);
-        if (!commentValue.isEmpty())
+        bool deprecated;
+        String commentValue = ContentSearchUtils::findSourceMapURL(styleSheetText, ContentSearchUtils::CSSMagicComment, &deprecated);
+        if (!commentValue.isEmpty()) {
+            if (deprecated)
+                m_pageAgent->page()->console()->addMessage(NetworkMessageSource, WarningMessageLevel, "\"/*@ sourceMapURL=\" source mapping url declaration is deprecated, \"/*# sourceMapURL=\" declaration should be used instead.", finalURL(), 0);
             return commentValue;
+        }
     }
-
-    if (finalURL().isEmpty())
-        return String();
-
-    CachedResource* resource = m_pageAgent->cachedResource(m_pageAgent->mainFrame(), KURL(ParsedURLString, finalURL()));
-    if (resource)
-        return resource->response().httpHeaderField(sourceMapHttpHeader);
-    return String();
+    return m_pageAgent->resourceSourceMapURL(finalURL());
 }
 
 InspectorCSSId InspectorStyleSheet::ruleOrStyleId(CSSStyleDeclaration* style) const
 {
     unsigned index = ruleIndexByStyle(style);
     if (index != UINT_MAX)
         return InspectorCSSId(id(), index);
     return InspectorCSSId();
 }
 
@@ skipping 334 matching lines @@
 
     RefPtr<MutableStylePropertySet> tempDeclaration = MutableStylePropertySet::create();
     RuleSourceDataList ruleSourceDataResult;
     StyleSheetHandler handler(m_styleText, m_element->document(), m_element->document()->elementSheet()->contents(), &ruleSourceDataResult);
     createCSSParser(m_element->document())->parseDeclaration(tempDeclaration.get(), m_styleText, &handler, m_element->document()->elementSheet()->contents());
     return ruleSourceDataResult.first().release();
 }
 
 } // namespace WebCore