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

Source/core/inspector/ContentSearchUtils.cpp

 /*
  * Copyright (C) 2011 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.
  *
@@ skipping 144 matching lines @@
 
     OwnPtr<RegularExpression> regex = ContentSearchUtils::createSearchRegex(query, caseSensitive, isRegex);
     Vector<pair<int, String> > matches = getRegularExpressionMatchesByLines(regex.get(), text);
 
     for (Vector<pair<int, String> >::const_iterator it = matches.begin(); it != matches.end(); ++it)
         result->addItem(buildObjectForSearchMatch(it->first, it->second));
 
     return result;
 }
 
-String findMagicComment(const String& content, const String& name, MagicCommentType commentType)
+static String findMagicComment(const String& content, const String& name, MagicCommentType commentType, bool* deprecated = 0)
 {
     ASSERT(name.find("=") == notFound);
+    if (deprecated)
+        *deprecated = false;
     String pattern;
+    String deprecatedPattern;
     switch (commentType) {
     case JavaScriptMagicComment:
-        pattern= "//@[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s\'\"]*)[\040\t]*$";
+        pattern = "//#[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s\'\"]*)[\040\t]*$";
+        deprecatedPattern = "//@[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s\'\"]*)[\040\t]*$";
         break;
     case CSSMagicComment:
-        pattern= "/\\*@[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s]*)[\040\t]*\\*/[\040\t]*$";
+        pattern = "/\\*#[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s]*)[\040\t]*\\*/[\040\t]*$";
+        deprecatedPattern = "/\\*@[\040\t]" + createSearchRegexSource(name) + "=[\040\t]*([^\\s]*)[\040\t]*\\*/[\040\t]*$";
         break;
     default:
         ASSERT_NOT_REACHED();
         return String();
     }
     RegularExpression regex(pattern, TextCaseSensitive, MultilineEnabled);
+    RegularExpression deprecatedRegex(deprecatedPattern, TextCaseSensitive, MultilineEnabled);
 
     int matchLength;
     int offset = regex.match(content, 0, &matchLength);
+    if (offset == -1) {
+        offset = deprecatedRegex.match(content, 0, &matchLength);
+        if (offset != -1 && deprecated)
+            *deprecated = true;
+    }
     if (offset == -1)
         return String();
 
     String match = content.substring(offset, matchLength);
     size_t separator = match.find("=");
     ASSERT(separator != notFound);
     match = match.substring(separator + 1);
 
     switch (commentType) {
     case JavaScriptMagicComment:
         return match.stripWhiteSpace();
     case CSSMagicComment: {
         size_t lastStarIndex = match.reverseFind('*');
         ASSERT(lastStarIndex != notFound);
         return match.substring(0, lastStarIndex).stripWhiteSpace();
     }
     default:
         ASSERT_NOT_REACHED();
         return String();
     }
 }
 
-String findSourceURL(const String& content, MagicCommentType commentType)
+String findSourceURL(const String& content, MagicCommentType commentType, bool* deprecated)
 {
-    return findMagicComment(content, "sourceURL", commentType);
+    return findMagicComment(content, "sourceURL", commentType, deprecated);
 }
 
-String findSourceMapURL(const String& content, MagicCommentType commentType)
+String findSourceMapURL(const String& content, MagicCommentType commentType, bool* deprecated)
 {
-    return findMagicComment(content, "sourceMappingURL", commentType);
+    return findMagicComment(content, "sourceMappingURL", commentType, deprecated);
 }
 
 } // namespace ContentSearchUtils
 } // namespace WebCore