Changeset 212860 in webkit
- Timestamp:
- Feb 22, 2017 3:55:34 PM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r212857 r212860 1 2017-02-22 Antti Koivisto <antti@apple.com> 2 3 Replace SimpleLineLayout::Range by WTF::IteratorRange 4 https://bugs.webkit.org/show_bug.cgi?id=168742 5 6 Reviewed by Zalan Bujtas. 7 8 Kill a redundant custom type. 9 10 * rendering/SimpleLineLayoutResolver.cpp: 11 (WebCore::SimpleLineLayout::RunResolver::rangeForRect): 12 (WebCore::SimpleLineLayout::RunResolver::rangeForRenderer): 13 (WebCore::SimpleLineLayout::RunResolver::rangeForRendererWithOffsets): 14 * rendering/SimpleLineLayoutResolver.h: 15 (WebCore::SimpleLineLayout::LineResolver::rangeForRect): 16 (WebCore::SimpleLineLayout::Range::Range): Deleted. 17 (WebCore::SimpleLineLayout::Range::begin): Deleted. 18 (WebCore::SimpleLineLayout::Range::end): Deleted. 19 1 20 2017-02-22 Simon Fraser <simon.fraser@apple.com> 2 21 -
trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp
r212693 r212860 146 146 } 147 147 148 Range<RunResolver::Iterator> RunResolver::rangeForRect(const LayoutRect& rect) const148 WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRect(const LayoutRect& rect) const 149 149 { 150 150 if (!m_lineHeight) 151 return Range<Iterator>(begin(), end());151 return { begin(), end() }; 152 152 153 153 unsigned firstLine = lineIndexForHeight(rect.y(), IndexType::First); … … 156 156 auto rangeBegin = begin().advanceLines(firstLine); 157 157 if (rangeBegin == end()) 158 return Range<Iterator>(end(), end());158 return { end(), end() }; 159 159 auto rangeEnd = rangeBegin; 160 160 ASSERT(lastLine >= firstLine); 161 161 rangeEnd.advanceLines(lastLine - firstLine + 1); 162 return Range<Iterator>(rangeBegin, rangeEnd);163 } 164 165 Range<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderObject& renderer) const162 return { rangeBegin, rangeEnd }; 163 } 164 165 WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderObject& renderer) const 166 166 { 167 167 if (begin() == end()) 168 return Range<Iterator>(end(), end());168 return { end(), end() }; 169 169 FlowContents::Iterator segment = m_flowContents.begin(); 170 170 auto run = begin(); … … 184 184 // Collapsed whitespace with dedicated renderer could end up with no run at all. 185 185 if (run == end() || (segment->start != segment->end && segment->end <= (*run).start())) 186 return Range<Iterator>(end(), end());186 return { end(), end() }; 187 187 188 188 auto rangeBegin = run; … … 193 193 if (run == rangeBegin) 194 194 ++run; 195 return Range<Iterator>(rangeBegin, run);195 return { rangeBegin, run }; 196 196 } 197 197 … … 220 220 } 221 221 222 Range<RunResolver::Iterator> RunResolver::rangeForRendererWithOffsets(const RenderObject& renderer, unsigned startOffset, unsigned endOffset) const222 WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRendererWithOffsets(const RenderObject& renderer, unsigned startOffset, unsigned endOffset) const 223 223 { 224 224 ASSERT(startOffset <= endOffset); -
trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h
r212854 r212860 30 30 #include "SimpleLineLayoutFlowContents.h" 31 31 #include "SimpleLineLayoutFunctions.h" 32 #include <wtf/IteratorRange.h> 32 33 #include <wtf/text/WTFString.h> 33 34 34 35 namespace WebCore { 35 36 namespace SimpleLineLayout { 36 37 template <class IteratorType>38 class Range {39 public:40 Range(IteratorType begin, IteratorType end) : m_begin(begin), m_end(end) { }41 42 IteratorType begin() const { return m_begin; }43 IteratorType end() const { return m_end; }44 45 private:46 IteratorType m_begin;47 IteratorType m_end;48 };49 37 50 38 class RunResolver { … … 114 102 Iterator end() const; 115 103 116 Range<Iterator> rangeForRect(const LayoutRect&) const;117 Range<Iterator> rangeForRenderer(const RenderObject&) const;104 WTF::IteratorRange<Iterator> rangeForRect(const LayoutRect&) const; 105 WTF::IteratorRange<Iterator> rangeForRenderer(const RenderObject&) const; 118 106 Iterator runForPoint(const LayoutPoint&) const; 119 Range<Iterator> rangeForRendererWithOffsets(const RenderObject&, unsigned start, unsigned end) const;107 WTF::IteratorRange<Iterator> rangeForRendererWithOffsets(const RenderObject&, unsigned start, unsigned end) const; 120 108 121 109 private: … … 159 147 Iterator end() const; 160 148 161 Range<Iterator> rangeForRect(const LayoutRect&) const;149 WTF::IteratorRange<Iterator> rangeForRect(const LayoutRect&) const; 162 150 163 151 private: … … 297 285 } 298 286 299 inline Range<LineResolver::Iterator> LineResolver::rangeForRect(const LayoutRect& rect) const287 inline WTF::IteratorRange<LineResolver::Iterator> LineResolver::rangeForRect(const LayoutRect& rect) const 300 288 { 301 289 auto runRange = m_runResolver.rangeForRect(rect); 302 return Range<Iterator>(Iterator(runRange.begin()), Iterator(runRange.end()));290 return { Iterator(runRange.begin()), Iterator(runRange.end()) }; 303 291 } 304 292
Note: See TracChangeset
for help on using the changeset viewer.