Changeset 157367 in webkit

Timestamp:

Oct 13, 2013, 4:39:33 AM (12 years ago)

Author:

Antti Koivisto

Message:

Rename InlineBox::remove() to removeFromParent
​https://bugs.webkit.org/show_bug.cgi?id=122725

Reviewed by Andreas Kling.

Also make it clear from the code that all InlineTextBoxes have behavesLikeText set.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (1 diff)
• rendering/InlineBox.h (modified) (1 diff)
• rendering/InlineTextBox.cpp (modified) (2 diffs)
• rendering/InlineTextBox.h (modified) (3 diffs)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderLineBreak.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderTextLineBoxes.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-13  Antti Koivisto  <antti@apple.com>
+
+        Rename InlineBox::remove() to removeFromParent
+        https://bugs.webkit.org/show_bug.cgi?id=122725
+
+        Reviewed by Andreas Kling.
+
+        Also make it clear from the code that all InlineTextBoxes have behavesLikeText set.
+
 2013-10-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -65 +65 @@
 #endif
 
-void InlineBox::remove()
+void InlineBox::removeFromParent()
 { 
     if (parent())

trunk/Source/WebCore/rendering/InlineBox.h

@@ -155 +155 @@
     bool isFirstLine() const { return m_bitfields.firstLine(); }
 
-    void remove();
+    void removeFromParent();
 
     InlineBox* nextOnLine() const { return m_next; }

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -100 +100 @@
 int InlineTextBox::baselinePosition(FontBaseline baselineType) const
 {
-    if (!behavesLikeText() || !parent())
+    if (!parent())
         return 0;
     if (&parent()->renderer() == renderer().parent())
@@ -109 +109 @@
 LayoutUnit InlineTextBox::lineHeight() const
 {
-    if (!behavesLikeText() || !renderer().parent())
+    if (!renderer().parent())
         return 0;
     if (&parent()->renderer() == renderer().parent())

trunk/Source/WebCore/rendering/InlineTextBox.h

@@ -52 +52 @@
         , m_truncation(cNoTruncation)
     {
+        setBehavesLikeText(true);
     }
 
@@ -161 +162 @@
     // Needs to be public, so the static paintTextWithShadows() function can use it.
     static FloatSize applyShadowToGraphicsContext(GraphicsContext*, const ShadowData*, const FloatRect& textRect, bool stroked, bool opaque, bool horizontal);
-
-private:
-    InlineTextBox* m_prevTextBox; // The previous box that also uses our RenderObject
-    InlineTextBox* m_nextTextBox; // The next box that also uses our RenderObject
-
-    int m_start;
-    unsigned short m_len;
-
-    unsigned short m_truncation; // Where to truncate when text overflow is applied.  We use special constants to
-                      // denote no truncation (the whole run paints) and full truncation (nothing paints at all).
 
 protected:
@@ -192 +183 @@
             | (expansion() && nextLeafChild() ? TextRun::AllowTrailingExpansion : TextRun::ForbidTrailingExpansion);
     }
+
+    void behavesLikeText() const WTF_DELETED_FUNCTION;
+
+    InlineTextBox* m_prevTextBox; // The previous box that also uses our RenderObject
+    InlineTextBox* m_nextTextBox; // The next box that also uses our RenderObject
+
+    int m_start;
+    unsigned short m_len;
+
+    // Where to truncate when text overflow is applied. We use special constants to
+    // denote no truncation (the whole run paints) and full truncation (nothing paints at all).
+    unsigned short m_truncation;
 };
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -235 +235 @@
             // children will be destroyed by the time we return from this function.
             if (isAnonymousBlock()) {
-                for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) {
-                    while (InlineBox* childBox = box->firstChild())
-                        childBox->remove();
+                for (auto box = firstLineBox(); box; box = box->nextLineBox()) {
+                    while (auto childBox = box->firstChild())
+                        childBox->removeFromParent();
                 }
             }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1969 +1969 @@
 
         // Nuke the box.
-        box->remove();
+        box->removeFromParent();
         box->destroy(renderArena());
     } else if (isReplaced()) {
@@ -1985 +1985 @@
     if (m_inlineBoxWrapper) {
         if (!documentBeingDestroyed())
-            m_inlineBoxWrapper->remove();
+            m_inlineBoxWrapper->removeFromParent();
         m_inlineBoxWrapper->destroy(renderArena());
         m_inlineBoxWrapper = 0;

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -108 +108 @@
             // root lines that can just be destroyed without disconnecting.
             if (firstLineBox()->parent()) {
-                for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
-                    box->remove();
+                for (auto box = firstLineBox(); box; box = box->nextLineBox())
+                    box->removeFromParent();
             }
         } else if (parent()) 

trunk/Source/WebCore/rendering/RenderLineBreak.cpp

@@ -91 +91 @@
         return;
     if (!documentBeingDestroyed())
-        m_inlineBoxWrapper->remove();
+        m_inlineBoxWrapper->removeFromParent();
     m_inlineBoxWrapper->destroy(renderArena());
     m_inlineBoxWrapper = nullptr;

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1003 +1003 @@
     if (!textBox->len()) {
         // We want the box to be destroyed.
-        textBox->remove();
+        textBox->removeFromParent();
         m_lineBoxes.remove(*textBox);
         textBox->destroy(renderArena());

trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp

@@ -52 +52 @@
         m_last = textBox;
     }
-    textBox->setBehavesLikeText(true);
     return textBox;
 }
@@ -115 +114 @@
     }
     for (auto box = m_first; box; box = box->nextTextBox())
-        box->remove();
+        box->removeFromParent();
 }