mirror of
https://github.com/electron/electron.git
synced 2026-01-07 22:54:25 -05:00
7433c14af5
* chore: add CLAUDE.md and Chromium Upgrade claude skill * Update script/lint.js Co-authored-by: David Sanders <dsanders11@ucsbalum.com> --------- Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
2.1 KiB
2.1 KiB
Analyzing Patch Failures
Investigation Steps
-
Read the patch file at
patches/{target}/{patch_name}.patch -
Examine current state of the file in Chromium at mentioned line numbers
-
Check recent upstream changes:
cd .. # or relevant target repo git log --oneline -10 -- {file} -
Find Chromium CL in commit messages:
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/{CL_NUMBER}
Common Failure Patterns
| Pattern | Cause | Solution |
|---|---|---|
| Context lines don't match | Surrounding code changed | Update context in patch |
| File not found | File renamed/moved | Update patch target path |
| Function not found | Refactored upstream | Find new function name |
DCHECK → CHECK_IS_TEST |
Macro change | Update to new macro |
| Deleted code | Feature removed | Verify patch still needed |
Using Git Blame
To find the CL that changed specific lines:
cd ..
git blame -L {start},{end} -- {file}
git log -1 {commit_sha} # Look for Reviewed-on: line
Verifying Patch Necessity
Before deleting a patch, verify:
- The patched functionality was intentionally removed upstream
- Electron doesn't need the patch for other reasons
- No other code depends on the patched behavior
When in doubt, keep the patch and adapt it.
Phase Two: Build-Time Patch Issues
Sometimes patches that applied successfully in Phase One cause build errors in Phase Two. This can happen when:
- Incomplete types: A patch disables a header include, but new upstream code uses the type
- Missing members: A patch modifies a class, but upstream added new code referencing the original
Finding Which Patch Affects a File
grep -l "filename.cc" patches/chromium/*.patch
Matching Existing Patch Patterns
When fixing build errors in patched files, examine the existing patch to understand its style:
- Does it use #if 0 / #endif guards?
- Does it use #if BUILDFLAG(...) conditionals?
- What's the pattern for disabled functionality?
Apply fixes consistent with the existing patch style.