Changeset 154681 in webkit

Timestamp:

Aug 27, 2013, 7:13:31 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Column Breakpoint not working, may be off by 1
​https://bugs.webkit.org/show_bug.cgi?id=120334

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-08-27
Reviewed by David Kilzer.

Source/WebCore:

JavaScriptCore changed to 1-based column numbers at some point. We
need to update the ScriptDebugger assumption that they were 0-based.

Test: inspector-protocol/debugger/column-breakpoint.html

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::createCallFrame):
(WebCore::ScriptDebugServer::updateCallFrameAndPauseIfNeeded):

LayoutTests:

Write a protocol test for setting a breakpoint at a line:column.

• inspector-protocol/debugger/column-breakpoint-expected.txt: Added.
• inspector-protocol/debugger/column-breakpoint.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector-protocol/debugger (added)
• LayoutTests/inspector-protocol/debugger/column-breakpoint-expected.txt (added)
• LayoutTests/inspector-protocol/debugger/column-breakpoint.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/ScriptDebugServer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-08-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Column Breakpoint not working, may be off by 1
+        https://bugs.webkit.org/show_bug.cgi?id=120334
+
+        Reviewed by David Kilzer.
+
+        Write a protocol test for setting a breakpoint at a line:column.
+
+        * inspector-protocol/debugger/column-breakpoint-expected.txt: Added.
+        * inspector-protocol/debugger/column-breakpoint.html: Added.
+
 2013-08-27  Krzysztof Czech  <k.czech@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Column Breakpoint not working, may be off by 1
+        https://bugs.webkit.org/show_bug.cgi?id=120334
+
+        Reviewed by David Kilzer.
+
+        JavaScriptCore changed to 1-based column numbers at some point. We
+        need to update the ScriptDebugger assumption that they were 0-based.
+
+        Test: inspector-protocol/debugger/column-breakpoint.html
+
+        * bindings/js/ScriptDebugServer.cpp:
+        (WebCore::ScriptDebugServer::createCallFrame):
+        (WebCore::ScriptDebugServer::updateCallFrameAndPauseIfNeeded):
+
 2013-08-27  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/bindings/js/ScriptDebugServer.cpp

@@ -391 +391 @@
 void ScriptDebugServer::createCallFrame(const DebuggerCallFrame& debuggerCallFrame, intptr_t sourceID, int lineNumber, int columnNumber)
 {
-    TextPosition textPosition(OrdinalNumber::fromOneBasedInt(lineNumber), OrdinalNumber::fromZeroBasedInt(columnNumber));
+    TextPosition textPosition(OrdinalNumber::fromOneBasedInt(lineNumber), OrdinalNumber::fromOneBasedInt(columnNumber));
     m_currentCallFrame = JavaScriptCallFrame::create(debuggerCallFrame, m_currentCallFrame, sourceID, textPosition);
     if (m_lastExecutedSourceId != sourceID) {
@@ -405 +405 @@
         return;
 
-    TextPosition textPosition(OrdinalNumber::fromOneBasedInt(lineNumber), OrdinalNumber::fromZeroBasedInt(columnNumber));
+    TextPosition textPosition(OrdinalNumber::fromOneBasedInt(lineNumber), OrdinalNumber::fromOneBasedInt(columnNumber));
     m_currentCallFrame->update(debuggerCallFrame, sourceID, textPosition);
     pauseIfNeeded(debuggerCallFrame.dynamicGlobalObject());