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

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

Issue 1651703002: More explicit LayoutUnit conversions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@evenMoarConstructors
Patch Set: Traits vs Properties vs Pandas Created 4 years, 10 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) 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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 void LayoutFlowThread::layout() 112 void LayoutFlowThread::layout()
113 { 113 {
114 m_pageLogicalSizeChanged = m_columnSetsInvalidated && everHadLayout(); 114 m_pageLogicalSizeChanged = m_columnSetsInvalidated && everHadLayout();
115 LayoutBlockFlow::layout(); 115 LayoutBlockFlow::layout();
116 m_pageLogicalSizeChanged = false; 116 m_pageLogicalSizeChanged = false;
117 } 117 }
118 118
119 void LayoutFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L ogicalExtentComputedValues& computedValues) const 119 void LayoutFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L ogicalExtentComputedValues& computedValues) const
120 { 120 {
121 computedValues.m_position = logicalTop; 121 computedValues.m_position = logicalTop;
122 computedValues.m_extent = 0; 122 computedValues.m_extent = LayoutUnit();
123 123
124 for (LayoutMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) { 124 for (LayoutMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) {
125 LayoutMultiColumnSet* columnSet = *iter; 125 LayoutMultiColumnSet* columnSet = *iter;
126 computedValues.m_extent += columnSet->logicalHeightInFlowThread(); 126 computedValues.m_extent += columnSet->logicalHeightInFlowThread();
127 } 127 }
128 } 128 }
129 129
130 bool LayoutFlowThread::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTes tAction) 130 bool LayoutFlowThread::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTes tAction)
131 { 131 {
132 if (hitTestAction == HitTestBlockBackground) 132 if (hitTestAction == HitTestBlockBackground)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) 196 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval)
197 { 197 {
198 if (m_result) 198 if (m_result)
199 return; 199 return;
200 if (interval.low() <= m_offset && interval.high() > m_offset) 200 if (interval.low() <= m_offset && interval.high() > m_offset)
201 m_result = interval.data(); 201 m_result = interval.data();
202 } 202 }
203 203
204 } // namespace blink 204 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698