| Summary: | Rename InlineIterator::block to m_block to match modern style | ||||||
|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Eric Seidel (no email) <eric> | ||||
| Component: | New Bugs | Assignee: | Eric Seidel (no email) <eric> | ||||
| Status: | RESOLVED FIXED | ||||||
| Severity: | Normal | CC: | abarth, commit-queue, rniwa | ||||
| Priority: | P2 | ||||||
| Version: | 528+ (Nightly build) | ||||||
| Hardware: | Other | ||||||
| OS: | OS X 10.5 | ||||||
| Bug Depends on: | |||||||
| Bug Blocks: | 50912 | ||||||
| Attachments: |
|
||||||
|
Description
Eric Seidel (no email)
2011-03-29 02:57:34 PDT
Created attachment 87288 [details]
Patch
Maybe your checkout is out of date? It seems like the change log change in your patch to rename obj is interfering with this one. Comment on attachment 87288 [details]
Patch
Again svn-apply knows how to handle this case.
Comment on attachment 87288 [details] Patch Rejecting attachment 87288 [details] from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: ceeded at 1 with fuzz 3. patching file Source/WebCore/rendering/InlineIterator.h Hunk #1 FAILED at 34. Hunk #2 FAILED at 42. Hunk #3 FAILED at 55. Hunk #4 FAILED at 186. Hunk #5 succeeded at 240 with fuzz 1. 4 out of 5 hunks FAILED -- saving rejects to file Source/WebCore/rendering/InlineIterator.h.rej patching file Source/WebCore/rendering/RenderBlockLineLayout.cpp Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Ryosuke Niwa', u'--for..." exit_code: 1 Full output: http://queues.webkit.org/results/8280257 Comment on attachment 87288 [details] Patch Clearing flags on attachment: 87288 Committed r82245: <http://trac.webkit.org/changeset/82245> All reviewed patches have been landed. Closing bug. |