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

Timestamp:

Jan 14, 2011, 7:49:20 AM (14 years ago)

Author:

[email protected]

Message:

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

Reviewed by Yury Semikhatsky.

Web Inspector: provide script column offset to frontend.
​https://bugs.webkit.org/show_bug.cgi?id=52377

• parser/SourceCode.h: (JSC::SourceCode::SourceCode): (JSC::SourceCode::firstColumn):

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

Reviewed by Yury Semikhatsky.

Web Inspector: provide script column offset to frontend.
​https://bugs.webkit.org/show_bug.cgi?id=52377

• bindings/js/ScriptDebugServer.cpp: (WebCore::ScriptDebugServer::dispatchDidParseSource):
• bindings/js/ScriptSourceCode.h: (WebCore::ScriptSourceCode::ScriptSourceCode):
• bindings/v8/DebuggerScript.js: ():
• bindings/v8/ScriptDebugServer.cpp: (WebCore::ScriptDebugServer::dispatchDidParseSource):
• inspector/Inspector.idl:
• inspector/InspectorDebuggerAgent.cpp: (WebCore::InspectorDebuggerAgent::didParseSource):
• inspector/InspectorDebuggerAgent.h:
• inspector/ScriptDebugListener.h:
• inspector/front-end/DebuggerModel.js: (WebInspector.DebuggerModel.prototype.parsedScriptSource):
• inspector/front-end/Script.js: (WebInspector.Script):

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 {
@@ -42 +43 @@
             , m_endChar(0)
             , m_firstLine(0)
+            , m_firstColumn(0)
         {
         }
 
-        SourceCode(PassRefPtr<SourceProvider> provider, int firstLine = 1)
+        SourceCode(PassRefPtr<SourceProvider> provider, int firstLine = 1, int firstColumn = 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)
+        SourceCode(PassRefPtr<SourceProvider> provider, int start, int end, int firstLine, int firstColumn = 1)
             : 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())
         {
         }
@@ -71 +84 @@
         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; }
@@ -81 +95 @@
         int m_endChar;
         int m_firstLine;
+        int m_firstColumn;
     };