| 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 | 593 |
| 594 columnRuleBounds.append(LayoutRect( | 594 columnRuleBounds.append(LayoutRect( |
| 595 ruleLeft, ruleTop, ruleRight - ruleLeft, ruleBottom - ruleTop)); | 595 ruleLeft, ruleTop, ruleRight - ruleLeft, ruleBottom - ruleTop)); |
| 596 } | 596 } |
| 597 | 597 |
| 598 ruleLogicalLeft = currLogicalLeftOffset; | 598 ruleLogicalLeft = currLogicalLeftOffset; |
| 599 } | 599 } |
| 600 return true; | 600 return true; |
| 601 } | 601 } |
| 602 | 602 |
| 603 LayoutRect LayoutMultiColumnSet::localOverflowRectForPaintInvalidation() const { | 603 LayoutRect LayoutMultiColumnSet::localVisualRect() const { |
| 604 LayoutRect blockFlowBounds = | 604 LayoutRect blockFlowBounds = LayoutBlockFlow::localVisualRect(); |
| 605 LayoutBlockFlow::localOverflowRectForPaintInvalidation(); | |
| 606 | 605 |
| 607 // Now add in column rule bounds, if present. | 606 // Now add in column rule bounds, if present. |
| 608 Vector<LayoutRect> columnRuleBounds; | 607 Vector<LayoutRect> columnRuleBounds; |
| 609 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) { | 608 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) { |
| 610 for (auto& bound : columnRuleBounds) | 609 for (auto& bound : columnRuleBounds) |
| 611 blockFlowBounds.unite(bound); | 610 blockFlowBounds.unite(bound); |
| 612 } | 611 } |
| 613 return blockFlowBounds; | 612 return blockFlowBounds; |
| 614 } | 613 } |
| 615 | 614 |
| 616 } // namespace blink | 615 } // namespace blink |
| OLD | NEW |