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

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

Issue 2522453003: invalidateColumnSets() doesn't need to mark anything for layout. (Closed)
Patch Set: Rebaseline test expectation. Less layout. Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlowThread.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 invalidateColumnSets(); 71 invalidateColumnSets();
72 // Clear the interval tree right away, instead of leaving it around with dead 72 // Clear the interval tree right away, instead of leaving it around with dead
73 // objects. Not that anyone _should_ try to access the interval tree when the 73 // objects. Not that anyone _should_ try to access the interval tree when the
74 // column sets are marked as invalid, but this is actually possible if other 74 // column sets are marked as invalid, but this is actually possible if other
75 // parts of the engine has bugs that cause us to not lay out everything that 75 // parts of the engine has bugs that cause us to not lay out everything that
76 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT 76 // was marked for layout, so that LayoutObject::assertLaidOut() (and a LOT
77 // of other assertions) fails. 77 // of other assertions) fails.
78 m_multiColumnSetIntervalTree.clear(); 78 m_multiColumnSetIntervalTree.clear();
79 } 79 }
80 80
81 void LayoutFlowThread::invalidateColumnSets() {
82 if (m_columnSetsInvalidated) {
83 ASSERT(selfNeedsLayout());
84 return;
85 }
86
87 setNeedsLayoutAndFullPaintInvalidation(
88 LayoutInvalidationReason::ColumnsChanged);
89
90 m_columnSetsInvalidated = true;
91 }
92
93 void LayoutFlowThread::validateColumnSets() { 81 void LayoutFlowThread::validateColumnSets() {
94 m_columnSetsInvalidated = false; 82 m_columnSetsInvalidated = false;
95 // Called to get the maximum logical width for the columnSet. 83 // Called to get the maximum logical width for the columnSet.
96 updateLogicalWidth(); 84 updateLogicalWidth();
97 generateColumnSetIntervalTree(); 85 generateColumnSetIntervalTree();
98 } 86 }
99 87
100 bool LayoutFlowThread::mapToVisualRectInAncestorSpace( 88 bool LayoutFlowThread::mapToVisualRectInAncestorSpace(
101 const LayoutBoxModelObject* ancestor, 89 const LayoutBoxModelObject* ancestor,
102 LayoutRect& rect, 90 LayoutRect& rect,
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 228
241 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded( 229 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(
242 const MultiColumnSetInterval& interval) { 230 const MultiColumnSetInterval& interval) {
243 if (m_result) 231 if (m_result)
244 return; 232 return;
245 if (interval.low() <= m_offset && interval.high() > m_offset) 233 if (interval.low() <= m_offset && interval.high() > m_offset)
246 m_result = interval.data(); 234 m_result = interval.data();
247 } 235 }
248 236
249 } // namespace blink 237 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlowThread.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698