Changeset 99167 in webkit for trunk/Source/JavaScriptCore/API/JSBase.cpp

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/API/JSBase.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSBase.cpp

@@ -51 +51 @@
     // evaluate sets "this" to the global object if it is NULL
     JSGlobalObject* globalObject = exec->dynamicGlobalObject();
-    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
+    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
 
     JSValue evaluationException;
@@ -74 +74 @@
     APIEntryShim entryShim(exec);
 
-    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), startingLineNumber);
+    SourceCode source = makeSource(script->ustring(), sourceURL->ustring(), TextPosition(OrdinalNumber::fromOneBasedInt(startingLineNumber), OrdinalNumber::first()));
     
     JSValue syntaxException;