Skip to content

Web Inspector: use zero-based Debugger.Location for InjectedScript.CallFrameProxy - #77418

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
dcrousso:eng/327972
Oct 19, 2026
Merged

Web Inspector: use zero-based Debugger.Location for InjectedScript.CallFrameProxy#77418
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
dcrousso:eng/327972

Conversation

@dcrousso

@dcrousso dcrousso commented Oct 18, 2026 •
edited by webkit-early-warning-system
Loading

Copy link
Copy Markdown
Member

996f659

Web Inspector: use zero-based `Debugger.Location` for `InjectedScript.CallFrameProxy`
https://bugs.webkit.org/show_bug.cgi?id=327972

Reviewed by Timothy Hatcher.

`SymbolTable` keeps one-based locations which are later used for `Debugger.Location` which expects zero-based coordinates.
Look at uses of `ScriptExecutable::firstLine` and `ScriptExecutable::startColumn` for how `SymbolTable` is populated.

* Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp:
(Inspector::valueForScopeLocation):

* LayoutTests/inspector/debugger/getFunctionDetails.html:
* LayoutTests/inspector/debugger/getFunctionDetails-expected.txt:
* LayoutTests/inspector/debugger/paused-scopes-expected.txt:

Canonical link: https://commits.webkit.org/324170@main

3be8ee8

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ⏳ 🛠 mac-cmake-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ⏳ 🧪 api-mac-cmake-debug ✅ 🧪 jsc-wpe
✅ 🧪 jsc-x86-64 ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk3-gcc
✅ 🛠 🧪 jsc-debug-arm64 ✅ 🛠 ios-safer-cpp ⏳ 🧪 mac-cmake-debug-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-wk2-stress ✅ 🧪 gtk-wk2
✅ 🛠 🧪 merge ✅ 🛠 vision-sim ✅ 🧪 mac-intel-wk2 ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🛠 mac-safer-cpp ✅ 🛠 playstation
✅ 🛠 tv ✅ 🧪 mac-site-isolation
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@dcrousso dcrousso self-assigned this Oct 18, 2026
@dcrousso dcrousso added the Web Inspector Bugs related to the WebKit Web Inspector. label Oct 18, 2026
@webkit-early-warning-system

webkit-early-warning-system commented Oct 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

EWS run on current version of this PR (hash 3be8ee8)

Details

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win
✅ 🛠 ios-sim ⏳ 🛠 mac-cmake-debug ✅ 🧪 wpe-wk2 ✅ 🧪 win-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ⏳ 🧪 api-mac-cmake-debug ✅ 🧪 jsc-wpe
✅ 🧪 jsc-x86-64 ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk3-gcc
✅ 🛠 🧪 jsc-debug-arm64 ✅ 🛠 ios-safer-cpp ⏳ 🧪 mac-cmake-debug-wk2 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-wk2-stress ✅ 🧪 gtk-wk2
✅ 🛠 🧪 merge ✅ 🛠 vision-sim ✅ 🧪 mac-intel-wk2 ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🛠 mac-safer-cpp ✅ 🛠 playstation
✅ 🛠 tv ✅ 🧪 mac-site-isolation
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@dcrousso dcrousso added the merge-queue Applied to send a pull request to merge-queue label Oct 19, 2026
@dcrousso
Web Inspector: use zero-based Debugger.Location for `InjectedScript…
996f659 
….CallFrameProxy`

https://bugs.webkit.org/show_bug.cgi?id=327972

Reviewed by Timothy Hatcher.

`SymbolTable` keeps one-based locations which are later used for `Debugger.Location` which expects zero-based coordinates.
Look at uses of `ScriptExecutable::firstLine` and `ScriptExecutable::startColumn` for how `SymbolTable` is populated.

* Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp:
(Inspector::valueForScopeLocation):

* LayoutTests/inspector/debugger/getFunctionDetails.html:
* LayoutTests/inspector/debugger/getFunctionDetails-expected.txt:
* LayoutTests/inspector/debugger/paused-scopes-expected.txt:

Canonical link: https://commits.webkit.org/324170@main
@webkit-commit-queue

webkit-commit-queue commented Oct 19, 2026

Copy link
Copy Markdown
Collaborator

Committed 324170@main (996f659): https://commits.webkit.org/324170@main

Reviewed commits have been landed. Closing PR #77418 and removing active labels.

@webkit-commit-queue
webkit-commit-queue merged commit 996f659 into WebKit:main Oct 19, 2026
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Oct 19, 2026
@dcrousso
dcrousso deleted the eng/327972 branch October 19, 2026 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xeenon xeenon xeenon approved these changes
@patrickangle patrickangle Awaiting requested review from patrickangle patrickangle is a code owner
@burg burg Awaiting requested review from burg burg is a code owner
@the-chenergy the-chenergy Awaiting requested review from the-chenergy
@AnujPanta1 AnujPanta1 Awaiting requested review from AnujPanta1
@rcaliman-apple rcaliman-apple Awaiting requested review from rcaliman-apple

Assignees

@dcrousso dcrousso

Labels

Web Inspector Bugs related to the WebKit Web Inspector.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@dcrousso @webkit-early-warning-system @webkit-commit-queue @xeenon