Chromium Code Reviews Chromium Code Reviews
Issue
1315353005:
Avoid duplicated code in LayoutBlockChild::layoutBlockChild(). (Closed)
DescriptionAvoid duplicated code in LayoutBlockChild::layoutBlockChild().
Before laying out, we try to estimate and set the logical top of the child, but
it may turn out after one layout pass that the estimate was wrong, due to
margin collapsing, float clearance or pagination.
So sometimes we need to reposition and relayout once or even twice inside
layoutBlockChild(). This was done with slightly poorly duplicated code.
Refactor into positionAndLayoutOnceIfNeeded() (and
markDescendantsWithFloatsForLayoutIfNeeded()). One instance of this duplicated
code used to sit in adjustBlockChildForPagination(). Moved it into
layoutBlockChild(), to make it easier to understand what's going on (and to
give adjustBlockChildForPagination() one less thing to worry about - one
parameter removed). Renamed |result| to |newLogicalTop| in
adjustBlockChildForPagination(), and |logicalTopAfterClear| to |newLogicalTop|
in layoutBlockChild().
No behavioral changes were actually intended, but when unifying
almost-duplicated code, some changes are inevitable. Added some tests for
something that now works, and used to fail. In the subsequent layout passes we
forgot to check if the new position changed how we were affected by floats.
R=jchaffraix@chromium.org,leviw@chromium.org
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=201866
Patch Set 1 #
Total comments: 6
Patch Set 2 : code review: worded up a comment. #Patch Set 3 : Turn tests into check-layout.js tests #Patch Set 4 : Add some body style, to make fewer assumptions. #Patch Set 5 : Resurrected comment about first layout pass and improved it. #Messages
Total messages: 8 (2 generated)
|
