| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2012 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 ruleTop = paintOffset.y() + borderTop() + paddingTop(); | 605 ruleTop = paintOffset.y() + borderTop() + paddingTop(); |
| 606 ruleBottom = ruleTop + contentHeight(); | 606 ruleBottom = ruleTop + contentHeight(); |
| 607 } else { | 607 } else { |
| 608 ruleLeft = paintOffset.x() + borderLeft() + paddingLeft(); | 608 ruleLeft = paintOffset.x() + borderLeft() + paddingLeft(); |
| 609 ruleRight = ruleLeft + contentWidth(); | 609 ruleRight = ruleLeft + contentWidth(); |
| 610 ruleTop = | 610 ruleTop = |
| 611 paintOffset.y() + ruleLogicalLeft - ruleThickness / 2 + ruleAdd; | 611 paintOffset.y() + ruleLogicalLeft - ruleThickness / 2 + ruleAdd; |
| 612 ruleBottom = ruleTop + ruleThickness; | 612 ruleBottom = ruleTop + ruleThickness; |
| 613 } | 613 } |
| 614 | 614 |
| 615 columnRuleBounds.append(LayoutRect( | 615 columnRuleBounds.push_back(LayoutRect( |
| 616 ruleLeft, ruleTop, ruleRight - ruleLeft, ruleBottom - ruleTop)); | 616 ruleLeft, ruleTop, ruleRight - ruleLeft, ruleBottom - ruleTop)); |
| 617 } | 617 } |
| 618 | 618 |
| 619 ruleLogicalLeft = currLogicalLeftOffset; | 619 ruleLogicalLeft = currLogicalLeftOffset; |
| 620 } | 620 } |
| 621 return true; | 621 return true; |
| 622 } | 622 } |
| 623 | 623 |
| 624 LayoutRect LayoutMultiColumnSet::localVisualRect() const { | 624 LayoutRect LayoutMultiColumnSet::localVisualRect() const { |
| 625 LayoutRect blockFlowBounds = LayoutBlockFlow::localVisualRect(); | 625 LayoutRect blockFlowBounds = LayoutBlockFlow::localVisualRect(); |
| 626 | 626 |
| 627 // Now add in column rule bounds, if present. | 627 // Now add in column rule bounds, if present. |
| 628 Vector<LayoutRect> columnRuleBounds; | 628 Vector<LayoutRect> columnRuleBounds; |
| 629 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) { | 629 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) { |
| 630 for (auto& bound : columnRuleBounds) | 630 for (auto& bound : columnRuleBounds) |
| 631 blockFlowBounds.unite(bound); | 631 blockFlowBounds.unite(bound); |
| 632 } | 632 } |
| 633 return blockFlowBounds; | 633 return blockFlowBounds; |
| 634 } | 634 } |
| 635 | 635 |
| 636 } // namespace blink | 636 } // namespace blink |
| OLD | NEW |