Changeset 191135 in webkit for trunk/Source/JavaScriptCore/parser/SourceProvider.h

Timestamp:

Oct 15, 2015, 1:50:02 PM (10 years ago)

Author:

[email protected]

Message:

Web Inspector: JavaScriptCore should parse sourceURL and sourceMappingURL directives
​https://bugs.webkit.org/show_bug.cgi?id=150096

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-10-15
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• inspector/ContentSearchUtilities.cpp:

(Inspector::ContentSearchUtilities::scriptCommentPattern): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceURL): Deleted.
(Inspector::ContentSearchUtilities::findScriptSourceMapURL): Deleted.

• inspector/ContentSearchUtilities.h:

No longer need to search script content.

• inspector/ScriptDebugServer.cpp:

(Inspector::ScriptDebugServer::dispatchDidParseSource):
Carry over the sourceURL and sourceMappingURL from the SourceProvider.

• inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::sourceMapURLForScript):
(Inspector::InspectorDebuggerAgent::didParseSource):
No longer do content searching.

• parser/Lexer.cpp:

(JSC::Lexer<T>::setCode):
(JSC::Lexer<T>::skipWhitespace):
(JSC::Lexer<T>::parseCommentDirective):
(JSC::Lexer<T>::parseCommentDirectiveValue):
(JSC::Lexer<T>::consume):
(JSC::Lexer<T>::lex):

• parser/Lexer.h:

(JSC::Lexer::sourceURL):
(JSC::Lexer::sourceMappingURL):
(JSC::Lexer::sourceProvider): Deleted.
Give lexer the ability to detect script comment directives.
This just consumes characters in single line comments and
ultimately sets the sourceURL or sourceMappingURL found.

• parser/Parser.h:

(JSC::Parser<LexerType>::parse):

• parser/SourceProvider.h:

(JSC::SourceProvider::url):
(JSC::SourceProvider::sourceURL):
(JSC::SourceProvider::sourceMappingURL):
(JSC::SourceProvider::setSourceURL):
(JSC::SourceProvider::setSourceMappingURL):
After parsing a script, update the Source Provider with the
value of directives that may have been found in the script.

Source/WebInspectorUI:

• UserInterface/Test/InspectorProtocol.js:

(InspectorProtocol._sendMessage):
(InspectorProtocol.dispatchMessageFromBackend):
This is only used for tests, so avoid console.log
and just dump directly to the system console.

LayoutTests:

• inspector/debugger/sourceURLs-expected.txt: Added.
• inspector/debugger/sourceURLs.html: Added.

sourceURL and sourceMappingURL detection.

File:

• trunk/Source/JavaScriptCore/parser/SourceProvider.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -50 +50 @@
         }
 
-        const String& url() { return m_url; }
+        const String& url() const { return m_url; }
+        const String& sourceURL() const { return m_sourceURL; }
+        const String& sourceMappingURL() const { return m_sourceMappingURL; }
+
         TextPosition startPosition() const { return m_startPosition; }
         intptr_t asID()
@@ -63 +66 @@
 
     private:
+        template <typename T> friend class Parser;
+
+        void setSourceURL(const String& sourceURL) { m_sourceURL = sourceURL; }
+        void setSourceMappingURL(const String& sourceMappingURL) { m_sourceMappingURL = sourceMappingURL; }
 
         JS_EXPORT_PRIVATE void getID();
@@ -68 +75 @@
 
         String m_url;
+        String m_sourceURL;
+        String m_sourceMappingURL;
         TextPosition m_startPosition;
         bool m_validated : 1;