Changeset 82249 in webkit


Ignore:
Timestamp:
Mar 29, 2011 7:35:02 AM (13 years ago)
Author:
eric@webkit.org
Message:

2011-03-29 Eric Seidel <eric@webkit.org>

Reviewed by Ryosuke Niwa.

Rename InlineIterator::nextBreakablePosition to m_nextBreakablePosition to match modern style
https://bugs.webkit.org/show_bug.cgi?id=57323

All of these m_nextBreakablePosition = -1 could probably be replaced with
some new methods. But I'll do that in a separate change. Clearly
m_nextBreakablePosition is just a cached value which should be cleared
at the right times. I suspect we may even fail to clear it sometimes when
we should due to the current used of direct access instead of smarter functions.

  • rendering/InlineIterator.h: (WebCore::InlineIterator::InlineIterator): (WebCore::InlineIterator::increment):
  • rendering/RenderBlockLineLayout.cpp: (WebCore::tryHyphenating): (WebCore::RenderBlock::findNextLineBreak):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r82247 r82249  
     12011-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
    1212011-03-29  Jeff Miller  <jeffm@apple.com>
    222
  • trunk/Source/WebCore/rendering/InlineIterator.h

    r82245 r82249  
    3838        , m_obj(0)
    3939        , pos(0)
    40         , nextBreakablePosition(-1)
     40        , m_nextBreakablePosition(-1)
    4141    {
    4242    }
     
    4646        , m_obj(o)
    4747        , pos(p)
    48         , nextBreakablePosition(-1)
     48        , m_nextBreakablePosition(-1)
    4949    {
    5050    }
     
    5959    RenderObject* m_obj;
    6060    unsigned pos;
    61     int nextBreakablePosition;
     61    int m_nextBreakablePosition;
    6262};
    6363
     
    189189            m_obj = bidiNext(m_block, m_obj, resolver);
    190190            pos = 0;
    191             nextBreakablePosition = -1;
     191            m_nextBreakablePosition = -1;
    192192        }
    193193    } else {
    194194        m_obj = bidiNext(m_block, m_obj, resolver);
    195195        pos = 0;
    196         nextBreakablePosition = -1;
     196        m_nextBreakablePosition = -1;
    197197    }
    198198}
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r82245 r82249  
    15071507    lineBreak.m_obj = text;
    15081508    lineBreak.pos = lastSpace + prefixLength;
    1509     lineBreak.nextBreakablePosition = nextBreakable;
     1509    lineBreak.m_nextBreakablePosition = nextBreakable;
    15101510    hyphenated = true;
    15111511}
     
    15501550    RenderObject* last = o;
    15511551    unsigned pos = resolver.position().pos;
    1552     int nextBreakable = resolver.position().nextBreakablePosition;
     1552    int nextBreakable = resolver.position().m_nextBreakablePosition;
    15531553    bool atStart = true;
    15541554
     
    15871587                lBreak.m_obj = o;
    15881588                lBreak.pos = 0;
    1589                 lBreak.nextBreakablePosition = -1;
     1589                lBreak.m_nextBreakablePosition = -1;
    15901590                lBreak.increment();
    15911591
     
    16881688                lBreak.m_obj = o;
    16891689                lBreak.pos = 0;
    1690                 lBreak.nextBreakablePosition = -1;
     1690                lBreak.m_nextBreakablePosition = -1;
    16911691            }
    16921692
     
    17611761                lBreak.m_obj = o;
    17621762                lBreak.pos = 0;
    1763                 lBreak.nextBreakablePosition = -1;
     1763                lBreak.m_nextBreakablePosition = -1;
    17641764                ASSERT(!len);
    17651765            }
     
    18591859                                lBreak.m_obj = o;
    18601860                                lBreak.pos = pos;
    1861                                 lBreak.nextBreakablePosition = nextBreakable;
     1861                                lBreak.m_nextBreakablePosition = nextBreakable;
    18621862                                skipTrailingWhitespace(lBreak, isLineEmpty, previousLineBrokeCleanly);
    18631863                            }
     
    19001900                        lBreak.m_obj = o;
    19011901                        lBreak.pos = pos;
    1902                         lBreak.nextBreakablePosition = nextBreakable;
     1902                        lBreak.m_nextBreakablePosition = nextBreakable;
    19031903                        lBreak.increment();
    19041904                        previousLineBrokeCleanly = true;
     
    19121912                        lBreak.m_obj = o;
    19131913                        lBreak.pos = pos;
    1914                         lBreak.nextBreakablePosition = nextBreakable;
     1914                        lBreak.m_nextBreakablePosition = nextBreakable;
    19151915                        // Auto-wrapping text should not wrap in the middle of a word once it has had an
    19161916                        // opportunity to break after a word.
     
    19231923                        lBreak.m_obj = o;
    19241924                        lBreak.pos = pos;
    1925                         lBreak.nextBreakablePosition = nextBreakable;
     1925                        lBreak.m_nextBreakablePosition = nextBreakable;
    19261926                        midWordBreak &= (breakWords || breakAll);
    19271927                    }
     
    19631963                        lBreak.m_obj = o;
    19641964                        lBreak.pos = pos;
    1965                         lBreak.nextBreakablePosition = nextBreakable;
     1965                        lBreak.m_nextBreakablePosition = nextBreakable;
    19661966                    }
    19671967                }
     
    20282028                        lBreak.m_obj = next;
    20292029                        lBreak.pos = 0;
    2030                         lBreak.nextBreakablePosition = -1;
     2030                        lBreak.m_nextBreakablePosition = -1;
    20312031                    }
    20322032                }
     
    20602060                lBreak.m_obj = next;
    20612061                lBreak.pos = 0;
    2062                 lBreak.nextBreakablePosition = -1;
     2062                lBreak.m_nextBreakablePosition = -1;
    20632063            }
    20642064        }
     
    20802080        lBreak.m_obj = 0;
    20812081        lBreak.pos = 0;
    2082         lBreak.nextBreakablePosition = -1;
     2082        lBreak.m_nextBreakablePosition = -1;
    20832083    }
    20842084
     
    20942094                lBreak.m_obj = last;
    20952095                lBreak.pos = last->isText() ? last->length() : 0;
    2096                 lBreak.nextBreakablePosition = -1;
     2096                lBreak.m_nextBreakablePosition = -1;
    20972097            }
    20982098        } else if (lBreak.m_obj) {
     
    21022102            lBreak.m_obj = o;
    21032103            lBreak.pos = pos;
    2104             lBreak.nextBreakablePosition = -1;
     2104            lBreak.m_nextBreakablePosition = -1;
    21052105        }
    21062106    }
Note: See TracChangeset for help on using the changeset viewer.