Commit df8aa4c
Resolve merge conflicts preserving Bun's AsyncContext support
- PromiseOperations.js: Keep AsyncContext parameter and add @neverInline from upstream
- PlatformHave.h: Merge Apple platform feature detection for both compatibility mode and randomization API
- Interpreter.cpp: Preserve Bun's stack trace appender while adding upstream's async stack traces
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>File tree
899 files changed
+254068
-263638
lines changed- Configurations
- JSTests
- microbenchmarks
- stress
- wasm
- js-api
- noJIT
- stress
- LayoutTests
- accessibility/mac
- fast/css-grid-layout
- http/tests/webgpu/webgpu
- api
- operation
- adapter
- command_buffer
- memory_sync/buffer
- rendering
- storage_texture
- texture_view
- validation
- image_copy
- render_pass
- render_pipeline
- resource_usages/texture
- idl
- shader
- execution
- expression
- call/builtin
- constructor
- validation
- decl
- expression
- binary
- call/builtin
- functions
- parse
- shader_io
- uniformity
- util/texture
- web_platform
- canvas
- copyToTexture
- imported/w3c
- resources
- web-platform-tests
- css
- css-color
- parsing
- css-text/text-indent
- css-typed-om/the-stylepropertymap/properties
- html
- anonymous-iframe
- resources
- rendering/replaced-elements
- attributes-for-embedded-content-and-images
- the-select-element
- customizable-select
- semantics
- document-metadata
- the-link-element
- the-title-element
- embedded-content/the-canvas-element
- mathml
- presentation-markup
- mrow
- operators
- scripts
- relations/css-styling/parsing
- tools
- webaudio
- resources
- the-audio-api
- the-analysernode-interface
- the-audiobuffersourcenode-interface
- the-audiocontext-interface
- the-audionode-interface
- the-audioparam-interface
- the-channelmergernode-interface
- the-channelsplitternode-interface
- the-gainnode-interface
- the-pannernode-interface
- the-waveshapernode-interface
- webrtc/protocol
- platform
- glib
- svg
- custom
- foreignObject
- text
- gtk
- imported/w3c/web-platform-tests/html/anonymous-iframe
- svg
- W3C-SVG-1.1-SE
- W3C-SVG-1.1
- ios
- imported/w3c/web-platform-tests/html/anonymous-iframe
- mac-wk1
- mac-wk2
- mac
- win
- wpe
- imported/w3c/web-platform-tests/html/anonymous-iframe
- svg
- W3C-SVG-1.1-SE
- W3C-SVG-1.1
- svg/as-image
- resources
- Source
- JavaScriptCore
- builtins
- bytecompiler
- dfg
- ftl
- heap
- interpreter
- jit
- llint
- runtime
- tools
- wasm
- js
- ThirdParty/libwebrtc
- Configurations
- libwebrtc.xcodeproj
- WTF
- Scripts/Preferences
- wtf
- cocoa
- glib
- spi/darwin
- text
- WebCore
- Configurations
- Modules
- WebGPU
- Implementation
- InternalAPI
- async-clipboard
- encryptedmedia
- fetch
- mediacontrols
- mediastream
- gstreamer
- libwebrtc
- PAL/pal/spi
- cg
- cocoa
- SaferCPPExpectations
- WebCore.xcodeproj
- accessibility
- atspi
- cocoa
- ios
- isolatedtree
- mac
- crypto
- algorithms
- cocoa
- gcrypt
- parameters
- cssjit
- css
- parser
- scripts
- test
- TestCSSPropertiesResults
- values
- color
- dom
- en.lproj
- fileapi
- html
- inspector
- agents
- layout
- formattingContexts/inline
- display
- integration
- inline
- loader
- page
- platform
- audio
- cocoa
- gstreamer
- graphics
- avfoundation/objc
- cairo
- cg
- gstreamer
- skia
- rendering
- mac
- mathml
- style
- svg
- legacy
- style
- values
- backgrounds
- color
- images
- masking
- motion
- non-standard
- svg
- testing
- workers
- service/context
- WebGPU/WebGPU
- WebKit
- GPUProcess
- webrtc
- NetworkProcess
- Downloads
- ServiceWorker
- cache
- cocoa
- curl
- soup
- Platform/IPC
- glib
- unix
- Resources/SandboxProfiles/ios
- SaferCPPExpectations
- UIProcess
- API
- Cocoa
- C
- glib
- mac
- Automation/cocoa
- Cocoa
- Extensions/Cocoa
- Launcher
- glib
- playstation
- WebAuthentication/Cocoa
- ios
- mac
- WPEPlatform/wpe/drm
- WebKit.xcodeproj
- WebProcess
- Automation
- GPU/media
- InjectedBundle
- API
- c
- gtk/DOM
- Plugins/PDF
- UnifiedPDF
- Storage
- WebCoreSupport
- WebPage
- cocoa
- mac
- cmake
- Tools
- CISupport
- build-webkit-org
- ews-build
- Scripts
- libraries/webkitapipy/webkitapipy
- webkitpy
- style/checkers
- webdriver_tests
- TestWebKitAPI
- TestWebKitAPI.xcodeproj
- Tests
- WTF
- WebKitCocoa
- WebKitGLib
- cocoa
- glib
- WebKitTestRunner
- InjectedBundle
- Bindings
- lldb
- metadata
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
899 files changed
+254068
-263638
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | 1 | | |
3 | 2 | | |
4 | 3 | | |
| |||
0 commit comments