Changeset 82249 in webkit
- Timestamp:
- Mar 29, 2011 7:35:02 AM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r82247 r82249 1 2011-03-29 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Ryosuke Niwa. 4 5 Rename InlineIterator::nextBreakablePosition to m_nextBreakablePosition to match modern style 6 https://bugs.webkit.org/show_bug.cgi?id=57323 7 8 All of these m_nextBreakablePosition = -1 could probably be replaced with 9 some new methods. But I'll do that in a separate change. Clearly 10 m_nextBreakablePosition is just a cached value which should be cleared 11 at the right times. I suspect we may even fail to clear it sometimes when 12 we should due to the current used of direct access instead of smarter functions. 13 14 * rendering/InlineIterator.h: 15 (WebCore::InlineIterator::InlineIterator): 16 (WebCore::InlineIterator::increment): 17 * rendering/RenderBlockLineLayout.cpp: 18 (WebCore::tryHyphenating): 19 (WebCore::RenderBlock::findNextLineBreak): 20 1 21 2011-03-29 Jeff Miller <jeffm@apple.com> 2 22 -
trunk/Source/WebCore/rendering/InlineIterator.h
r82245 r82249 38 38 , m_obj(0) 39 39 , pos(0) 40 , nextBreakablePosition(-1)40 , m_nextBreakablePosition(-1) 41 41 { 42 42 } … … 46 46 , m_obj(o) 47 47 , pos(p) 48 , nextBreakablePosition(-1)48 , m_nextBreakablePosition(-1) 49 49 { 50 50 } … … 59 59 RenderObject* m_obj; 60 60 unsigned pos; 61 int nextBreakablePosition;61 int m_nextBreakablePosition; 62 62 }; 63 63 … … 189 189 m_obj = bidiNext(m_block, m_obj, resolver); 190 190 pos = 0; 191 nextBreakablePosition = -1;191 m_nextBreakablePosition = -1; 192 192 } 193 193 } else { 194 194 m_obj = bidiNext(m_block, m_obj, resolver); 195 195 pos = 0; 196 nextBreakablePosition = -1;196 m_nextBreakablePosition = -1; 197 197 } 198 198 } -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r82245 r82249 1507 1507 lineBreak.m_obj = text; 1508 1508 lineBreak.pos = lastSpace + prefixLength; 1509 lineBreak. nextBreakablePosition = nextBreakable;1509 lineBreak.m_nextBreakablePosition = nextBreakable; 1510 1510 hyphenated = true; 1511 1511 } … … 1550 1550 RenderObject* last = o; 1551 1551 unsigned pos = resolver.position().pos; 1552 int nextBreakable = resolver.position(). nextBreakablePosition;1552 int nextBreakable = resolver.position().m_nextBreakablePosition; 1553 1553 bool atStart = true; 1554 1554 … … 1587 1587 lBreak.m_obj = o; 1588 1588 lBreak.pos = 0; 1589 lBreak. nextBreakablePosition = -1;1589 lBreak.m_nextBreakablePosition = -1; 1590 1590 lBreak.increment(); 1591 1591 … … 1688 1688 lBreak.m_obj = o; 1689 1689 lBreak.pos = 0; 1690 lBreak. nextBreakablePosition = -1;1690 lBreak.m_nextBreakablePosition = -1; 1691 1691 } 1692 1692 … … 1761 1761 lBreak.m_obj = o; 1762 1762 lBreak.pos = 0; 1763 lBreak. nextBreakablePosition = -1;1763 lBreak.m_nextBreakablePosition = -1; 1764 1764 ASSERT(!len); 1765 1765 } … … 1859 1859 lBreak.m_obj = o; 1860 1860 lBreak.pos = pos; 1861 lBreak. nextBreakablePosition = nextBreakable;1861 lBreak.m_nextBreakablePosition = nextBreakable; 1862 1862 skipTrailingWhitespace(lBreak, isLineEmpty, previousLineBrokeCleanly); 1863 1863 } … … 1900 1900 lBreak.m_obj = o; 1901 1901 lBreak.pos = pos; 1902 lBreak. nextBreakablePosition = nextBreakable;1902 lBreak.m_nextBreakablePosition = nextBreakable; 1903 1903 lBreak.increment(); 1904 1904 previousLineBrokeCleanly = true; … … 1912 1912 lBreak.m_obj = o; 1913 1913 lBreak.pos = pos; 1914 lBreak. nextBreakablePosition = nextBreakable;1914 lBreak.m_nextBreakablePosition = nextBreakable; 1915 1915 // Auto-wrapping text should not wrap in the middle of a word once it has had an 1916 1916 // opportunity to break after a word. … … 1923 1923 lBreak.m_obj = o; 1924 1924 lBreak.pos = pos; 1925 lBreak. nextBreakablePosition = nextBreakable;1925 lBreak.m_nextBreakablePosition = nextBreakable; 1926 1926 midWordBreak &= (breakWords || breakAll); 1927 1927 } … … 1963 1963 lBreak.m_obj = o; 1964 1964 lBreak.pos = pos; 1965 lBreak. nextBreakablePosition = nextBreakable;1965 lBreak.m_nextBreakablePosition = nextBreakable; 1966 1966 } 1967 1967 } … … 2028 2028 lBreak.m_obj = next; 2029 2029 lBreak.pos = 0; 2030 lBreak. nextBreakablePosition = -1;2030 lBreak.m_nextBreakablePosition = -1; 2031 2031 } 2032 2032 } … … 2060 2060 lBreak.m_obj = next; 2061 2061 lBreak.pos = 0; 2062 lBreak. nextBreakablePosition = -1;2062 lBreak.m_nextBreakablePosition = -1; 2063 2063 } 2064 2064 } … … 2080 2080 lBreak.m_obj = 0; 2081 2081 lBreak.pos = 0; 2082 lBreak. nextBreakablePosition = -1;2082 lBreak.m_nextBreakablePosition = -1; 2083 2083 } 2084 2084 … … 2094 2094 lBreak.m_obj = last; 2095 2095 lBreak.pos = last->isText() ? last->length() : 0; 2096 lBreak. nextBreakablePosition = -1;2096 lBreak.m_nextBreakablePosition = -1; 2097 2097 } 2098 2098 } else if (lBreak.m_obj) { … … 2102 2102 lBreak.m_obj = o; 2103 2103 lBreak.pos = pos; 2104 lBreak. nextBreakablePosition = -1;2104 lBreak.m_nextBreakablePosition = -1; 2105 2105 } 2106 2106 }
Note: See TracChangeset
for help on using the changeset viewer.