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 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
575 } | 575 } |
576 | 576 |
577 column_heights_changed_ = false; | 577 column_heights_changed_ = false; |
578 InvalidateColumnSets(); | 578 InvalidateColumnSets(); |
579 UpdateLayout(); | 579 UpdateLayout(); |
580 ValidateColumnSets(); | 580 ValidateColumnSets(); |
581 } | 581 } |
582 | 582 |
583 void LayoutMultiColumnFlowThread::ColumnRuleStyleDidChange() { | 583 void LayoutMultiColumnFlowThread::ColumnRuleStyleDidChange() { |
584 for (LayoutMultiColumnSet* column_set = FirstMultiColumnSet(); column_set; | 584 for (LayoutMultiColumnSet* column_set = FirstMultiColumnSet(); column_set; |
585 column_set = column_set->NextSiblingMultiColumnSet()) | 585 column_set = column_set->NextSiblingMultiColumnSet()) { |
586 column_set->SetShouldDoFullPaintInvalidation(kPaintInvalidationStyleChange); | 586 column_set->SetShouldDoFullPaintInvalidation( |
| 587 PaintInvalidationReason::kStyle); |
| 588 } |
587 } | 589 } |
588 | 590 |
589 bool LayoutMultiColumnFlowThread::RemoveSpannerPlaceholderIfNoLongerValid( | 591 bool LayoutMultiColumnFlowThread::RemoveSpannerPlaceholderIfNoLongerValid( |
590 LayoutBox* spanner_object_in_flow_thread) { | 592 LayoutBox* spanner_object_in_flow_thread) { |
591 DCHECK(spanner_object_in_flow_thread->SpannerPlaceholder()); | 593 DCHECK(spanner_object_in_flow_thread->SpannerPlaceholder()); |
592 if (DescendantIsValidColumnSpanner(spanner_object_in_flow_thread)) | 594 if (DescendantIsValidColumnSpanner(spanner_object_in_flow_thread)) |
593 return false; // Still a valid spanner. | 595 return false; // Still a valid spanner. |
594 | 596 |
595 // No longer a valid spanner. Get rid of the placeholder. | 597 // No longer a valid spanner. Get rid of the placeholder. |
596 DestroySpannerPlaceholder( | 598 DestroySpannerPlaceholder( |
(...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1411 const { | 1413 const { |
1412 return MultiColumnLayoutState(last_set_worked_on_); | 1414 return MultiColumnLayoutState(last_set_worked_on_); |
1413 } | 1415 } |
1414 | 1416 |
1415 void LayoutMultiColumnFlowThread::RestoreMultiColumnLayoutState( | 1417 void LayoutMultiColumnFlowThread::RestoreMultiColumnLayoutState( |
1416 const MultiColumnLayoutState& state) { | 1418 const MultiColumnLayoutState& state) { |
1417 last_set_worked_on_ = state.ColumnSet(); | 1419 last_set_worked_on_ = state.ColumnSet(); |
1418 } | 1420 } |
1419 | 1421 |
1420 } // namespace blink | 1422 } // namespace blink |
OLD | NEW |