Changeset 156025 in webkit

Timestamp:

Sep 17, 2013 11:30:30 PM (11 years ago)

Author:

Antti Koivisto

Message:

Rename InlineBox::isText()
<​https://webkit.org/b/121525>

Reviewed by Andreas Kling.

The flag sounds like RenderObject::isText() yet it can be set for some inline boxes generated
for non-text renderers too (br, list markers). This is pretty confusing.

Rename to InlineBox::behavesLikeText().

• rendering/InlineBox.cpp:

(WebCore::InlineBox::logicalHeight):
(WebCore::InlineBox::baselinePosition):
(WebCore::InlineBox::lineHeight):

• rendering/InlineBox.h:

(WebCore::InlineBox::behavesLikeText):
(WebCore::InlineBox::setBehavesLikeText):
(WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields):

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::addToLine):
(WebCore::InlineFlowBox::placeBoxesInBlockDirection):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::baselinePosition):
(WebCore::InlineTextBox::lineHeight):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::createInlineBoxForRenderer):
(WebCore::setLogicalWidthForTextRun):

• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::createInlineBox):

• rendering/RenderText.cpp:

(WebCore::RenderText::createInlineTextBox):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::includeLeadingForBox):
(WebCore::RootInlineBox::includeFontForBox):
(WebCore::RootInlineBox::includeGlyphsForBox):
(WebCore::RootInlineBox::includeMarginForBox):

Switch tests from isText() to isTextOrBR(). This matches the behavior before r155957.
I don't know if there is a case where this actually makes any difference in behavior.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (3 diffs)
• rendering/InlineBox.h (modified) (3 diffs)
• rendering/InlineFlowBox.cpp (modified) (4 diffs)
• rendering/InlineTextBox.cpp (modified) (2 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (3 diffs)
• rendering/RenderListMarker.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Antti Koivisto  <antti@apple.com>
+
+        Rename InlineBox::isText()
+        <https://webkit.org/b/121525>
+
+        Reviewed by Andreas Kling.
+
+        The flag sounds like RenderObject::isText() yet it can be set for some inline boxes generated
+        for non-text renderers too (br, list markers). This is pretty confusing.
+        
+        Rename to InlineBox::behavesLikeText().
+
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::logicalHeight):
+        (WebCore::InlineBox::baselinePosition):
+        (WebCore::InlineBox::lineHeight):
+        * rendering/InlineBox.h:
+        (WebCore::InlineBox::behavesLikeText):
+        (WebCore::InlineBox::setBehavesLikeText):
+        (WebCore::InlineBox::InlineBoxBitfields::InlineBoxBitfields):
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::addToLine):
+        (WebCore::InlineFlowBox::placeBoxesInBlockDirection):
+        * rendering/InlineTextBox.cpp:
+        (WebCore::InlineTextBox::baselinePosition):
+        (WebCore::InlineTextBox::lineHeight):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::createInlineBoxForRenderer):
+        (WebCore::setLogicalWidthForTextRun):
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::createInlineBox):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::createInlineTextBox):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::includeLeadingForBox):
+        (WebCore::RootInlineBox::includeFontForBox):
+        (WebCore::RootInlineBox::includeGlyphsForBox):
+        (WebCore::RootInlineBox::includeMarginForBox):
+        
+            Switch tests from isText() to isTextOrBR(). This matches the behavior before r155957.
+            I don't know if there is a case where this actually makes any difference in behavior.
+
 2013-09-17  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -143 +143 @@
     
     if (renderer().isTextOrBR())
-        return m_bitfields.isText() ? renderer().style(isFirstLineStyle())->fontMetrics().height() : 0;
+        return behavesLikeText() ? renderer().style(isFirstLineStyle())->fontMetrics().height() : 0;
     if (renderer().isBox() && parent())
         return isHorizontal() ? toRenderBox(renderer()).height() : toRenderBox(renderer()).width();
@@ -158 +158 @@
 int InlineBox::baselinePosition(FontBaseline baselineType) const
 {
-    if (renderer().isBR() && !isText())
+    if (renderer().isBR() && !behavesLikeText())
         return 0;
     return boxModelObject()->baselinePosition(baselineType, m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);
@@ -165 +165 @@
 LayoutUnit InlineBox::lineHeight() const
 {
-    if (renderer().isBR() && !isText())
+    if (renderer().isBR() && !behavesLikeText())
         return 0;
     return boxModelObject()->lineHeight(m_bitfields.firstLine(), isHorizontal() ? HorizontalLine : VerticalLine, PositionOnContainingLine);

trunk/Source/WebCore/rendering/InlineBox.h

@@ -118 +118 @@
 #endif
 
-    bool isText() const { return m_bitfields.isText(); }
-    void setIsText(bool isText) { m_bitfields.setIsText(isText); }
+    bool behavesLikeText() const { return m_bitfields.behavesLikeText(); }
+    void setBehavesLikeText(bool behavesLikeText) { m_bitfields.setBehavesLikeText(behavesLikeText); }
  
     virtual bool isInlineFlowBox() const { return false; }
@@ -337 +337 @@
             , m_hasEllipsisBoxOrHyphen(false)
             , m_dirOverride(false)
-            , m_isText(false)
+            , m_behavesLikeText(false)
             , m_determinedIfNextOnLineExists(false)
             , m_nextOnLineExists(false)
@@ -368 +368 @@
         // for InlineTextBox
         ADD_BOOLEAN_BITFIELD(dirOverride, DirOverride);
-        ADD_BOOLEAN_BITFIELD(isText, IsText); // Whether or not this object represents text with a non-zero height. Includes non-image list markers, text boxes.
+        ADD_BOOLEAN_BITFIELD(behavesLikeText, BehavesLikeText); // Whether or not this object represents text with a non-zero height. Includes non-image list markers, text boxes, br.
 
     private:

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -112 +112 @@
     child->setFirstLineStyleBit(isFirstLineStyle());
     child->setIsHorizontal(isHorizontal());
-    if (child->isText()) {
+    if (child->behavesLikeText()) {
         if (child->renderer().parent() == &renderer())
             m_hasTextChildren = true;
@@ -127 +127 @@
         if (child->renderer().isReplaced())
             shouldClearDescendantsHaveSameLineHeightAndBaseline = true;
-        else if (child->isText()) {
+        else if (child->behavesLikeText()) {
             if (child->renderer().isBR() || child->renderer().parent() != &renderer()) {
                 if (!parentStyle->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle->font().fontMetrics())
@@ -159 +159 @@
 
     if (!child->renderer().isOutOfFlowPositioned()) {
-        if (child->isText()) {
+        if (child->behavesLikeText()) {
             RenderStyle* childStyle = child->renderer().style(isFirstLineStyle());
             if (childStyle->letterSpacing() < 0 || childStyle->textShadow() || childStyle->textEmphasisMark() != TextEmphasisMarkNone || childStyle->textStrokeWidth())
@@ -660 +660 @@
         LayoutUnit boxHeightIncludingMargins = boxHeight;
             
-        if (curr->isText() || curr->isInlineFlowBox()) {
+        if (curr->behavesLikeText() || curr->isInlineFlowBox()) {
             const FontMetrics& fontMetrics = curr->renderer().style(isFirstLineStyle())->fontMetrics();
             newLogicalTop += curr->baselinePosition(baselineType) - fontMetrics.ascent(baselineType);

trunk/Source/WebCore/rendering/InlineTextBox.cpp

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

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -275 +275 @@
         // We only treat a box as text for a <br> if we are on a line by ourself or in strict mode
         // (Note the use of strict mode. In "almost strict" mode, we don't treat the box for <br> as text.)
-        inlineBox->setIsText(isOnlyRun || obj->document().inNoQuirksMode());
+        inlineBox->setBehavesLikeText(isOnlyRun || obj->document().inNoQuirksMode());
         return inlineBox;
     }
@@ -657 +657 @@
     run->m_box->setLogicalWidth(measuredWidth + hyphenWidth);
     if (!fallbackFonts.isEmpty()) {
-        ASSERT(run->m_box->isText());
+        ASSERT(run->m_box->behavesLikeText());
         GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.add(toInlineTextBox(run->m_box), make_pair(Vector<const SimpleFontData*>(), GlyphOverflow())).iterator;
         ASSERT(it->value.first.isEmpty());
@@ -664 +664 @@
     }
     if ((glyphOverflow.top || glyphOverflow.bottom || glyphOverflow.left || glyphOverflow.right)) {
-        ASSERT(run->m_box->isText());
+        ASSERT(run->m_box->behavesLikeText());
         GlyphOverflowAndFallbackFontsMap::iterator it = textBoxDataMap.add(toInlineTextBox(run->m_box), make_pair(Vector<const SimpleFontData*>(), GlyphOverflow())).iterator;
         it->value.second = glyphOverflow;

trunk/Source/WebCore/rendering/RenderListMarker.cpp

@@ -1165 +1165 @@
 {
     InlineBox* result = RenderBox::createInlineBox();
-    result->setIsText(isText());
+    result->setBehavesLikeText(isText());
     return result;
 }

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1439 +1439 @@
         m_lastTextBox = textBox;
     }
-    textBox->setIsText(true);
+    textBox->setBehavesLikeText(true);
     return textBox;
 }

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -1002 +1002 @@
 bool RootInlineBox::includeLeadingForBox(InlineBox* box) const
 {
-    if (box->renderer().isReplaced() || (box->renderer().isText() && !box->isText()))
+    if (box->renderer().isReplaced() || (box->renderer().isTextOrBR() && !box->behavesLikeText()))
         return false;
 
@@ -1011 +1011 @@
 bool RootInlineBox::includeFontForBox(InlineBox* box) const
 {
-    if (box->renderer().isReplaced() || (box->renderer().isText() && !box->isText()))
+    if (box->renderer().isReplaced() || (box->renderer().isTextOrBR() && !box->behavesLikeText()))
         return false;
     
-    if (!box->isText() && box->isInlineFlowBox() && !toInlineFlowBox(box)->hasTextChildren())
+    if (!box->behavesLikeText() && box->isInlineFlowBox() && !toInlineFlowBox(box)->hasTextChildren())
         return false;
 
@@ -1024 +1024 @@
 bool RootInlineBox::includeGlyphsForBox(InlineBox* box) const
 {
-    if (box->renderer().isReplaced() || (box->renderer().isText() && !box->isText()))
+    if (box->renderer().isReplaced() || (box->renderer().isTextOrBR() && !box->behavesLikeText()))
         return false;
     
-    if (!box->isText() && box->isInlineFlowBox() && !toInlineFlowBox(box)->hasTextChildren())
+    if (!box->behavesLikeText() && box->isInlineFlowBox() && !toInlineFlowBox(box)->hasTextChildren())
         return false;
 
@@ -1037 +1037 @@
 bool RootInlineBox::includeMarginForBox(InlineBox* box) const
 {
-    if (box->renderer().isReplaced() || (box->renderer().isText() && !box->isText()))
+    if (box->renderer().isReplaced() || (box->renderer().isTextOrBR() && !box->behavesLikeText()))
         return false;