OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
82 const SegmentRangeList& segmentRanges() const { return m_segmentRanges; } | 82 const SegmentRangeList& segmentRanges() const { return m_segmentRanges; } |
83 const LineSegment* currentSegment() const | 83 const LineSegment* currentSegment() const |
84 { | 84 { |
85 if (!hasSegments()) | 85 if (!hasSegments()) |
86 return 0; | 86 return 0; |
87 ASSERT(m_segmentRanges.size() < m_segments.size()); | 87 ASSERT(m_segmentRanges.size() < m_segments.size()); |
88 return &m_segments[m_segmentRanges.size()]; | 88 return &m_segments[m_segmentRanges.size()]; |
89 } | 89 } |
90 void clearSegments() { m_segments.clear(); } | 90 void clearSegments() { m_segments.clear(); } |
91 bool adjustLogicalLineTop(float minSegmentWidth); | 91 bool adjustLogicalLineTop(float minSegmentWidth); |
92 LayoutUnit computeFirstFitPositionForFloat(const LayoutSize) const; | 92 LayoutUnit computeFirstFitPositionForFloat(const FloatSize) const; |
leviw_travelin_and_unemployed
2014/01/10 21:56:52
I don't imagine you mean to pass this const by val
| |
93 | 93 |
94 void setNeedsLayout(bool value) { m_needsLayout = value; } | 94 void setNeedsLayout(bool value) { m_needsLayout = value; } |
95 bool needsLayout() { return m_needsLayout; } | 95 bool needsLayout() { return m_needsLayout; } |
96 | 96 |
97 virtual bool lineOverlapsShapeBounds() const OVERRIDE | 97 virtual bool lineOverlapsShapeBounds() const OVERRIDE |
98 { | 98 { |
99 return computedShape()->lineOverlapsShapePaddingBounds(m_shapeLineTop, m _lineHeight); | 99 return computedShape()->lineOverlapsShapePaddingBounds(m_shapeLineTop, m _lineHeight); |
100 } | 100 } |
101 | 101 |
102 protected: | 102 protected: |
(...skipping 16 matching lines...) Expand all Loading... | |
119 , m_needsLayout(false) | 119 , m_needsLayout(false) |
120 { } | 120 { } |
121 | 121 |
122 SegmentRangeList m_segmentRanges; | 122 SegmentRangeList m_segmentRanges; |
123 bool m_needsLayout; | 123 bool m_needsLayout; |
124 SegmentList m_segments; | 124 SegmentList m_segments; |
125 }; | 125 }; |
126 | 126 |
127 } | 127 } |
128 #endif | 128 #endif |
OLD | NEW |