Bug 26829 – add methods baselinePosition and lineHeight to InlineBox

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Roland Steiner]

[outtake from larger ruby patch - see bug #3749]

There are quite a few places in the code of InlineBox and InlineFlowBox in the form:

boxPtr->renderer()->lineHeight()

same for baselinePosition(). Adding corresponding methods to InlineBox would make the code more readable.

Also, implementation for ruby will make use of those new methods.

[Roland Steiner]

Created attachment 32033 [details]
patch: add methods lineHeight and baselinePosition to InlineBox

[Maciej Stachowiak]

Comment on attachment 32033 [details]
patch: add methods lineHeight and baselinePosition to InlineBox

There is a chunk in here that's unrelated to the refactoring mentioned in the ChangeLog. I discussed with Roland, and he is going to submit a new patch.

[Roland Steiner]

Created attachment 32288 [details]
patch: removed unrelad

[Roland Steiner]

Created attachment 32289 [details]
patch: removed unrelated code change from initial patch

[Maciej Stachowiak]

Comment on attachment 32289 [details]
patch: removed unrelated code change from initial patch

r=me

[Roland Steiner]

(In reply to comment #5)

Thanks a lot for the review! Can I ask you to commit the patch for me, please?

[Eric Seidel (no email)]

Comment on attachment 32289 [details]
patch: removed unrelated code change from initial patch

patching file WebCore/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebCore/rendering/InlineBox.h
Hunk #1 succeeded at 205 (offset 4 lines).
Hunk #2 FAILED at 283.
1 out of 2 hunks FAILED -- saving rejects to file WebCore/rendering/InlineBox.h.rej
patch -p0 "WebCore/rendering/InlineBox.h" returned 1.  Pass --force to ignore patch failures.
Patch https://bugs.webkit.org/attachment.cgi?id=32289 failed to download and apply.

[Eric Seidel (no email)]

Someone could possibly land this manually.  I didn't investigate the failure.

[Roland Steiner]

Created attachment 32352 [details]
patch: update to remove conflicts

Same as previous patch, updated to remove patching conflicts

[Eric Seidel (no email)]

Comment on attachment 32352 [details]
patch: update to remove conflicts

It looks like WebCore/rendering/InlineBox.h has tabs. :(

[Eric Seidel (no email)]

Comment on attachment 32352 [details]
patch: update to remove conflicts

Our tooling infrastructure should really warn you about that kind of thing.  Otherwise looks fine.

[Roland Steiner]

Created attachment 32356 [details]
patch: remove tabs

@_@ How did that happen? Updated patch to remove tabs.

[Roland Steiner]

Created attachment 32357 [details]
patch: remove tabs AND spurious file references

Today seems to be not my day.  >_< Removed spurious file references at the end of the patch file...

Sorry for the attachment spam.

[Eric Seidel (no email)]

Comment on attachment 32357 [details]
patch: remove tabs AND spurious file references

Looks fine.

[Roland Steiner]

(In reply to comment #14)

Would still need a kind soul to commit this for me, though... ^_^;

[Brent Fulgham]

Landed in http://trac.webkit.org/changeset/45701