Changeset 82245 in webkit

Timestamp:

Mar 29, 2011 7:06:50 AM (13 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Ryosuke Niwa.

Rename InlineIterator::block to m_block to match modern style
​https://bugs.webkit.org/show_bug.cgi?id=57321

I could have made m_block private, since it's only accessed in
one place outside of InlineIterator (for an ASSERT). But I chose
not to do so in this change.

• rendering/InlineIterator.h: (WebCore::InlineIterator::InlineIterator): (WebCore::InlineIterator::increment): (WebCore::InlineBidiResolver::appendRun):
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::findNextLineBreak):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineIterator.h (modified) (5 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-29  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Rename InlineIterator::block to m_block to match modern style
+        https://bugs.webkit.org/show_bug.cgi?id=57321
+
+        I could have made m_block private, since it's only accessed in
+        one place outside of InlineIterator (for an ASSERT).  But I chose
+        not to do so in this change.
+
+        * rendering/InlineIterator.h:
+        (WebCore::InlineIterator::InlineIterator):
+        (WebCore::InlineIterator::increment):
+        (WebCore::InlineBidiResolver::appendRun):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::findNextLineBreak):
+
 2011-03-29  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebCore/rendering/InlineIterator.h

@@ -35 +35 @@
 public:
     InlineIterator()
-        : block(0)
+        : m_block(0)
         , m_obj(0)
         , pos(0)
@@ -43 +43 @@
 
     InlineIterator(RenderBlock* b, RenderObject* o, unsigned p)
-        : block(b)
+        : m_block(b)
         , m_obj(o)
         , pos(p)
@@ -56 +56 @@
     ALWAYS_INLINE WTF::Unicode::Direction direction() const;
 
-    RenderBlock* block;
+    RenderBlock* m_block;
     RenderObject* m_obj;
     unsigned pos;
@@ -187 +187 @@
         pos++;
         if (pos >= toRenderText(m_obj)->textLength()) {
-            m_obj = bidiNext(block, m_obj, resolver);
+            m_obj = bidiNext(m_block, m_obj, resolver);
             pos = 0;
             nextBreakablePosition = -1;
         }
     } else {
-        m_obj = bidiNext(block, m_obj, resolver);
+        m_obj = bidiNext(m_block, m_obj, resolver);
         pos = 0;
         nextBreakablePosition = -1;
@@ -241 +241 @@
             RenderBlock::appendRunsForObject(start, obj->length(), obj, *this);        
             start = 0;
-            obj = bidiNext(sor.block, obj);
+            obj = bidiNext(sor.m_block, obj);
         }
         if (obj) {

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1514 +1514 @@
                                               bool& hyphenated, EClear* clear, FloatingObject* lastFloatFromPreviousLine, Vector<RenderBox*>& positionedBoxes)
 {
-    ASSERT(resolver.position().block == this);
+    ASSERT(resolver.position().m_block == this);
 
     bool appliedStartWidth = resolver.position().pos > 0;