Changeset 76129 in webkit for trunk/Source/JavaScriptCore/parser/SourceCode.h

Timestamp:

Jan 19, 2011, 9:01:12 AM (14 years ago)

Author:

[email protected]

Message:

2011-01-19 Pavel Podivilov <​[email protected]>

Reviewed by Yury Semikhatsky.

Web Inspector: [JSC] scripts have incorrect starting line (always 1).
​https://bugs.webkit.org/show_bug.cgi?id=52721

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

2011-01-19 Pavel Podivilov <​[email protected]>

Reviewed by Yury Semikhatsky.

Web Inspector: [JSC] scripts have incorrect starting line (always 1).
​https://bugs.webkit.org/show_bug.cgi?id=52721

• debugger/Debugger.cpp: (JSC::Debugger::recompileAllJSFunctions):
• debugger/Debugger.h:
• parser/Parser.h: (JSC::Parser::parse):
• parser/SourceCode.h: (JSC::SourceCode::SourceCode):
• parser/SourceProvider.h: (JSC::SourceProvider::startPosition):

2011-01-19 Pavel Podivilov <​[email protected]>

Reviewed by Yury Semikhatsky.

Web Inspector: [JSC] scripts have incorrect starting line (always 1).
​https://bugs.webkit.org/show_bug.cgi?id=52721

Test: inspector/debugger-scripts.html

• bindings/js/ScriptDebugServer.cpp: (WebCore::ScriptDebugServer::dispatchDidParseSource): (WebCore::ScriptDebugServer::dispatchFailedToParseSource): (WebCore::ScriptDebugServer::sourceParsed):
• bindings/js/ScriptDebugServer.h:
• bindings/js/ScriptSourceCode.h: (WebCore::ScriptSourceCode::ScriptSourceCode):
• bindings/js/StringSourceProvider.h: (WebCore::StringSourceProvider::create): (WebCore::StringSourceProvider::startPosition): (WebCore::StringSourceProvider::StringSourceProvider):

2011-01-19 Pavel Podivilov <​[email protected]>

Reviewed by Yury Semikhatsky.

Web Inspector: [JSC] scripts have incorrect starting line (always 1).
​https://bugs.webkit.org/show_bug.cgi?id=52721

• WebView/WebScriptDebugger.h:
• WebView/WebScriptDebugger.mm: (toNSString): (WebScriptDebugger::sourceParsed):

File:

• trunk/Source/JavaScriptCore/parser/SourceCode.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/parser/SourceCode.h

@@ -32 +32 @@
 #include "SourceProvider.h"
 #include <wtf/RefPtr.h>
-#include <wtf/text/TextPosition.h>
 
 namespace JSC {
@@ -43 +42 @@
             , m_endChar(0)
             , m_firstLine(0)
-            , m_firstColumn(0)
         {
         }
 
-        SourceCode(PassRefPtr<SourceProvider> provider, int firstLine = 1, int firstColumn = 1)
+        SourceCode(PassRefPtr<SourceProvider> provider, int firstLine = 1)
             : m_provider(provider)
             , m_startChar(0)
             , m_endChar(m_provider->length())
             , m_firstLine(std::max(firstLine, 1))
-            , m_firstColumn(std::max(firstColumn, 1))
         {
         }
 
-        SourceCode(PassRefPtr<SourceProvider> provider, int start, int end, int firstLine, int firstColumn = 1)
+        SourceCode(PassRefPtr<SourceProvider> provider, int start, int end, int firstLine)
             : m_provider(provider)
             , m_startChar(start)
             , m_endChar(end)
             , m_firstLine(std::max(firstLine, 1))
-            , m_firstColumn(std::max(firstColumn, 1))
-        {
-        }
-
-        SourceCode(PassRefPtr<SourceProvider> provider, const TextPosition1& startPosition)
-            : m_provider(provider)
-            , m_startChar(0)
-            , m_endChar(m_provider->length())
-            , m_firstLine(startPosition.m_line.oneBasedInt())
-            , m_firstColumn(startPosition.m_column.oneBasedInt())
         {
         }
@@ -84 +71 @@
         SourceProvider* provider() const { return m_provider.get(); }
         int firstLine() const { return m_firstLine; }
-        int firstColumn() const { return m_firstColumn; }
         int startOffset() const { return m_startChar; }
         int endOffset() const { return m_endChar; }
@@ -95 +81 @@
         int m_endChar;
         int m_firstLine;
-        int m_firstColumn;
     };