Bug 57321 - Rename InlineIterator::block to m_block to match modern style
Summary: Rename InlineIterator::block to m_block to match modern style
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Other OS X 10.5
: P2 Normal
Assignee: Eric Seidel (no email)
URL:
Keywords:
Depends on:
Blocks: 50912
  Show dependency tree / graph
 
Reported: 2011-03-29 02:57 PDT by Eric Seidel (no email)
Modified: 2011-03-29 07:07 PDT (History)
3 users (show)

See Also:

Attachments
Patch (4.00 KB, patch)
2011-03-29 02:58 PDT, Eric Seidel (no email) 		no flags Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Seidel (no email) 2011-03-29 02:57:34 PDT 
Rename InlineIterator::block to m_block to match modern style
Comment 1 Eric Seidel (no email) 2011-03-29 02:58:42 PDT 
Created attachment 87288 [details]
Patch
Comment 2 Ryosuke Niwa 2011-03-29 03:02:49 PDT 
Maybe your checkout is out of date?
Comment 3 Ryosuke Niwa 2011-03-29 03:05:15 PDT 
It seems like the change log change in your patch to rename obj is interfering with this one.
Comment 4 Eric Seidel (no email) 2011-03-29 03:15:29 PDT 
Comment on attachment 87288 [details]
Patch

Again svn-apply knows how to handle this case.
Comment 5 WebKit Commit Bot 2011-03-29 05:58:02 PDT 
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 6 WebKit Commit Bot 2011-03-29 07:07:06 PDT 
Comment on attachment 87288 [details]
Patch

Clearing flags on attachment: 87288

Committed r82245: <http://trac.webkit.org/changeset/82245>
Comment 7 WebKit Commit Bot 2011-03-29 07:07:12 PDT 
All reviewed patches have been landed.  Closing bug.