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

Timestamp:

Nov 3, 2011, 5:02:05 AM (14 years ago)

Author:

[email protected]

Message:

Web Inspector: preserve script location for inline handlers.
​https://bugs.webkit.org/show_bug.cgi?id=71367

Source/JavaScriptCore:

Makes SourceCode factories receive TextPosition instead of the line number;
Stores consistent position values in SourceCode and SourceProvider;

Patch by Pavel Feldman <​[email protected]> on 2011-11-03
Reviewed by Yury Semikhatsky.

• API/JSBase.cpp:

(JSEvaluateScript):
(JSCheckScriptSyntax):

• API/JSObjectRef.cpp:

(JSObjectMakeFunction):

• parser/SourceCode.h:

(JSC::makeSource):

• parser/SourceProvider.h:

(JSC::SourceProvider::SourceProvider):
(JSC::SourceProvider::startPosition):
(JSC::UStringSourceProvider::create):
(JSC::UStringSourceProvider::UStringSourceProvider):

• runtime/FunctionConstructor.cpp:

(JSC::constructFunction):
(JSC::constructFunctionSkippingEvalEnabledCheck):

• runtime/FunctionConstructor.h:

Source/WebCore:

Makes eventHandler report position, not line number;

Patch by Pavel Feldman <​[email protected]> on 2011-11-03
Reviewed by Yury Semikhatsky.

• bindings/js/CachedScriptSourceProvider.h:

(WebCore::CachedScriptSourceProvider::CachedScriptSourceProvider):

• bindings/js/JSLazyEventListener.cpp:

(WebCore::JSLazyEventListener::JSLazyEventListener):
(WebCore::JSLazyEventListener::initializeJSFunction):

• bindings/js/JSLazyEventListener.h:

(WebCore::JSLazyEventListener::create):

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::eventHandlerPosition):

• bindings/js/ScriptController.h:
• bindings/js/ScriptEventListener.cpp:

(WebCore::createAttributeEventListener):

• bindings/js/ScriptSourceProvider.h:

(WebCore::ScriptSourceProvider::ScriptSourceProvider):

• bindings/js/StringSourceProvider.h:

(WebCore::StringSourceProvider::create):
(WebCore::StringSourceProvider::StringSourceProvider):
(WebCore::makeSource):

LayoutTests:

Linkifier test reimplemented for simplisity.

Patch by Pavel Feldman <​[email protected]> on 2011-11-03
Reviewed by Yury Semikhatsky.

• inspector/debugger/debugger-scripts-expected.txt:
• inspector/debugger/debugger-scripts.html:
• inspector/debugger/linkifier-expected.txt:
• inspector/debugger/linkifier.html:
• platform/chromium/inspector/debugger/debugger-scripts-expected.txt: Copied from LayoutTests/inspector/debugger/debugger-scripts-expected.txt.

File:

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

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -41 +41 @@
     class SourceProvider : public RefCounted<SourceProvider> {
     public:
-        SourceProvider(const UString& url, SourceProviderCache* cache = 0)
+        SourceProvider(const UString& url, const TextPosition& startPosition, SourceProviderCache* cache = 0)
             : m_url(url)
+            , m_startPosition(startPosition)
             , m_validated(false)
             , m_cache(cache ? cache : new SourceProviderCache)
@@ -60 +61 @@
         
         const UString& url() { return m_url; }
-        virtual TextPosition startPosition() const { return TextPosition::minimumPosition(); }
+        TextPosition startPosition() const { return m_startPosition; }
         intptr_t asID() { return reinterpret_cast<intptr_t>(this); }
 
@@ -73 +74 @@
 
         UString m_url;
+        TextPosition m_startPosition;
         bool m_validated;
         SourceProviderCache* m_cache;
@@ -80 +82 @@
     class UStringSourceProvider : public SourceProvider {
     public:
-        static PassRefPtr<UStringSourceProvider> create(const UString& source, const UString& url)
+        static PassRefPtr<UStringSourceProvider> create(const UString& source, const UString& url, const TextPosition& startPosition = TextPosition::minimumPosition())
         {
-            return adoptRef(new UStringSourceProvider(source, url));
+            return adoptRef(new UStringSourceProvider(source, url, startPosition));
         }
 
@@ -93 +95 @@
 
     private:
-        UStringSourceProvider(const UString& source, const UString& url)
-            : SourceProvider(url)
+        UStringSourceProvider(const UString& source, const UString& url, const TextPosition& startPosition)
+            : SourceProvider(url, startPosition)
             , m_source(source)
             , m_data(m_source.characters16())