Title: [157980] branches/safari-537.73-branch
- Revision
- 157980
- Author
- [email protected]
- Date
- 2013-10-24 18:41:27 -0700 (Thu, 24 Oct 2013)
Log Message
Merged r154681. <rdar://problem/15109418>
Modified Paths
Added Paths
- branches/safari-537.73-branch/LayoutTests/inspector-protocol/debugger/
Diff
Modified: branches/safari-537.73-branch/LayoutTests/ChangeLog (157979 => 157980)
--- branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-25 01:35:45 UTC (rev 157979)
+++ branches/safari-537.73-branch/LayoutTests/ChangeLog 2013-10-25 01:41:27 UTC (rev 157980)
@@ -1,5 +1,21 @@
2013-10-24 Lucas Forschler <[email protected]>
+ Merge r154681
+
+ 2013-08-27 Joseph Pecoraro <[email protected]>
+
+ 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-10-24 Lucas Forschler <[email protected]>
+
Merge r154527
2013-08-23 Eric Carlson <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/ChangeLog (157979 => 157980)
--- branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 01:35:45 UTC (rev 157979)
+++ branches/safari-537.73-branch/Source/WebCore/ChangeLog 2013-10-25 01:41:27 UTC (rev 157980)
@@ -1,5 +1,24 @@
2013-10-24 Lucas Forschler <[email protected]>
+ Merge r154681
+
+ 2013-08-27 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Column Breakpoint not working, may be off by 1
+ https://bugs.webkit.org/show_bug.cgi?id=120334
+
+ Reviewed by David Kilzer.
+
+ _javascript_Core 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-10-24 Lucas Forschler <[email protected]>
+
Merge r154647
2013-08-23 Andy Estes <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebCore/bindings/js/ScriptDebugServer.cpp (157979 => 157980)
--- branches/safari-537.73-branch/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2013-10-25 01:35:45 UTC (rev 157979)
+++ branches/safari-537.73-branch/Source/WebCore/bindings/js/ScriptDebugServer.cpp 2013-10-25 01:41:27 UTC (rev 157980)
@@ -390,7 +390,7 @@
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 = _javascript_CallFrame::create(debuggerCallFrame, m_currentCallFrame, sourceID, textPosition);
if (m_lastExecutedSourceId != sourceID) {
m_lastExecutedLine = -1;
@@ -404,7 +404,7 @@
if (!m_currentCallFrame)
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());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
