Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.cpp

Issue 2314763002: Replace collectLayerFragments() with FragmentainerIterator. (Closed)
Patch Set: code review. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 } 412 }
413 413
414 LayoutRect LayoutMultiColumnSet::fragmentsBoundingBox(const LayoutRect& bounding BoxInFlowThread) const 414 LayoutRect LayoutMultiColumnSet::fragmentsBoundingBox(const LayoutRect& bounding BoxInFlowThread) const
415 { 415 {
416 LayoutRect result; 416 LayoutRect result;
417 for (const auto& group : m_fragmentainerGroups) 417 for (const auto& group : m_fragmentainerGroups)
418 result.unite(group.fragmentsBoundingBox(boundingBoxInFlowThread)); 418 result.unite(group.fragmentsBoundingBox(boundingBoxInFlowThread));
419 return result; 419 return result;
420 } 420 }
421 421
422 void LayoutMultiColumnSet::collectLayerFragments(PaintLayerFragments& fragments, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect)
423 {
424 for (const auto& group : m_fragmentainerGroups)
425 group.collectLayerFragments(fragments, layerBoundingBox, dirtyRect);
426 }
427
428 void LayoutMultiColumnSet::addOverflowFromChildren() 422 void LayoutMultiColumnSet::addOverflowFromChildren()
429 { 423 {
430 LayoutRect overflowRect; 424 LayoutRect overflowRect;
431 for (const auto& group : m_fragmentainerGroups) { 425 for (const auto& group : m_fragmentainerGroups) {
432 LayoutRect rect = group.calculateOverflow(); 426 LayoutRect rect = group.calculateOverflow();
433 rect.move(group.offsetFromColumnSet()); 427 rect.move(group.offsetFromColumnSet());
434 overflowRect.unite(rect); 428 overflowRect.unite(rect);
435 } 429 }
436 addLayoutOverflow(overflowRect); 430 addLayoutOverflow(overflowRect);
437 addContentsVisualOverflow(overflowRect); 431 addContentsVisualOverflow(overflowRect);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 // Now add in column rule bounds, if present. 535 // Now add in column rule bounds, if present.
542 Vector<LayoutRect> columnRuleBounds; 536 Vector<LayoutRect> columnRuleBounds;
543 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) { 537 if (computeColumnRuleBounds(LayoutPoint(), columnRuleBounds)) {
544 for (auto& bound : columnRuleBounds) 538 for (auto& bound : columnRuleBounds)
545 blockFlowBounds.unite(bound); 539 blockFlowBounds.unite(bound);
546 } 540 }
547 return blockFlowBounds; 541 return blockFlowBounds;
548 } 542 }
549 543
550 } // namespace blink 544 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698