OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 2269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2280 setStaticInlinePositionForChild(child, startAlignedOffsetForLine(logical
Top, indentText)); | 2280 setStaticInlinePositionForChild(child, startAlignedOffsetForLine(logical
Top, indentText)); |
2281 else | 2281 else |
2282 setStaticInlinePositionForChild(child, startOffsetForContent()); | 2282 setStaticInlinePositionForChild(child, startOffsetForContent()); |
2283 } | 2283 } |
2284 | 2284 |
2285 void LayoutBlockFlow::setStaticInlinePositionForChild(LayoutBox& child, LayoutUn
it inlinePosition) | 2285 void LayoutBlockFlow::setStaticInlinePositionForChild(LayoutBox& child, LayoutUn
it inlinePosition) |
2286 { | 2286 { |
2287 child.layer()->setStaticInlinePosition(inlinePosition); | 2287 child.layer()->setStaticInlinePosition(inlinePosition); |
2288 } | 2288 } |
2289 | 2289 |
| 2290 LayoutInline* LayoutBlockFlow::inlineElementContinuation() const |
| 2291 { |
| 2292 LayoutBoxModelObject* continuation = this->continuation(); |
| 2293 return continuation && continuation->isInline() ? toLayoutInline(continuatio
n) : nullptr; |
| 2294 } |
| 2295 |
2290 void LayoutBlockFlow::addChild(LayoutObject* newChild, LayoutObject* beforeChild
) | 2296 void LayoutBlockFlow::addChild(LayoutObject* newChild, LayoutObject* beforeChild
) |
2291 { | 2297 { |
2292 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { | 2298 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { |
2293 if (beforeChild == flowThread) | 2299 if (beforeChild == flowThread) |
2294 beforeChild = flowThread->firstChild(); | 2300 beforeChild = flowThread->firstChild(); |
2295 ASSERT(!beforeChild || beforeChild->isDescendantOf(flowThread)); | 2301 ASSERT(!beforeChild || beforeChild->isDescendantOf(flowThread)); |
2296 flowThread->addChild(newChild, beforeChild); | 2302 flowThread->addChild(newChild, beforeChild); |
2297 return; | 2303 return; |
2298 } | 2304 } |
2299 | 2305 |
(...skipping 1481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3781 if (!rect.isEmpty()) | 3787 if (!rect.isEmpty()) |
3782 rects.append(rect); | 3788 rects.append(rect); |
3783 } | 3789 } |
3784 } | 3790 } |
3785 | 3791 |
3786 if (inlineElementContinuation) | 3792 if (inlineElementContinuation) |
3787 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); | 3793 inlineElementContinuation->addOutlineRects(rects, additionalOffset + (in
lineElementContinuation->containingBlock()->location() - location()), includeBlo
ckOverflows); |
3788 } | 3794 } |
3789 | 3795 |
3790 } // namespace blink | 3796 } // namespace blink |
OLD | NEW |