| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 4216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4227 bool hasTopOverflow = !style()->isLeftToRightDirection() && !isHorizonta
lWritingMode(); | 4227 bool hasTopOverflow = !style()->isLeftToRightDirection() && !isHorizonta
lWritingMode(); |
| 4228 bool hasLeftOverflow = !style()->isLeftToRightDirection() && isHorizonta
lWritingMode(); | 4228 bool hasLeftOverflow = !style()->isLeftToRightDirection() && isHorizonta
lWritingMode(); |
| 4229 if (isFlexibleBox() && style()->isReverseFlexDirection()) { | 4229 if (isFlexibleBox() && style()->isReverseFlexDirection()) { |
| 4230 RenderFlexibleBox* flexibleBox = toRenderFlexibleBox(this); | 4230 RenderFlexibleBox* flexibleBox = toRenderFlexibleBox(this); |
| 4231 if (flexibleBox->isHorizontalFlow()) | 4231 if (flexibleBox->isHorizontalFlow()) |
| 4232 hasLeftOverflow = true; | 4232 hasLeftOverflow = true; |
| 4233 else | 4233 else |
| 4234 hasTopOverflow = true; | 4234 hasTopOverflow = true; |
| 4235 } | 4235 } |
| 4236 | 4236 |
| 4237 if (hasColumns() && style()->columnProgression() == ReverseColumnProgres
sion) { | |
| 4238 if (isHorizontalWritingMode() ^ !style()->hasInlineColumnAxis()) | |
| 4239 hasLeftOverflow = !hasLeftOverflow; | |
| 4240 else | |
| 4241 hasTopOverflow = !hasTopOverflow; | |
| 4242 } | |
| 4243 | |
| 4244 if (!hasTopOverflow) | 4237 if (!hasTopOverflow) |
| 4245 overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y())); | 4238 overflowRect.shiftYEdgeTo(max(overflowRect.y(), clientBox.y())); |
| 4246 else | 4239 else |
| 4247 overflowRect.shiftMaxYEdgeTo(min(overflowRect.maxY(), clientBox.maxY
())); | 4240 overflowRect.shiftMaxYEdgeTo(min(overflowRect.maxY(), clientBox.maxY
())); |
| 4248 if (!hasLeftOverflow) | 4241 if (!hasLeftOverflow) |
| 4249 overflowRect.shiftXEdgeTo(max(overflowRect.x(), clientBox.x())); | 4242 overflowRect.shiftXEdgeTo(max(overflowRect.x(), clientBox.x())); |
| 4250 else | 4243 else |
| 4251 overflowRect.shiftMaxXEdgeTo(min(overflowRect.maxX(), clientBox.maxX
())); | 4244 overflowRect.shiftMaxXEdgeTo(min(overflowRect.maxX(), clientBox.maxX
())); |
| 4252 | 4245 |
| 4253 // Now re-test with the adjusted rectangle and see if it has become unre
achable or fully | 4246 // Now re-test with the adjusted rectangle and see if it has become unre
achable or fully |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4690 return 0; | 4683 return 0; |
| 4691 | 4684 |
| 4692 if (!layoutState && !flowThreadContainingBlock()) | 4685 if (!layoutState && !flowThreadContainingBlock()) |
| 4693 return 0; | 4686 return 0; |
| 4694 | 4687 |
| 4695 RenderBlock* containerBlock = containingBlock(); | 4688 RenderBlock* containerBlock = containingBlock(); |
| 4696 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); | 4689 return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop(); |
| 4697 } | 4690 } |
| 4698 | 4691 |
| 4699 } // namespace WebCore | 4692 } // namespace WebCore |
| OLD | NEW |