Changeset 155975 in webkit

Timestamp:

Sep 17, 2013, 11:10:02 AM (11 years ago)

Author:

Antti Koivisto

Message:

Add isTextOrBR() and use it
​https://bugs.webkit.org/show_bug.cgi?id=121506

Reviewed by Darin Adler.

It is a popular test.

• dom/Document.cpp:

(WebCore::Document::updateHoverActiveState):

• editing/Editor.cpp:

(WebCore::findFirstMarkable):

• editing/TextIterator.cpp:

(WebCore::ignoresContainerClip):

• rendering/InlineBox.cpp:

(WebCore::InlineBox::logicalHeight):

• rendering/InlineIterator.h:

(WebCore::isIteratorTarget):

• rendering/RenderBlock.cpp:

(WebCore::InlineMinMaxIterator::next):

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlockFlow::layoutInlineChildren):

• rendering/RenderCounter.cpp:

(WebCore::planCounter):

• rendering/RenderObject.h:

(WebCore::RenderObject::isTextOrBR):

• rendering/RenderTreeAsText.cpp:

(WebCore::write):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::ascentAndDescentForBox):
(WebCore::RootInlineBox::verticalPositionForBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• editing/Editor.cpp (modified) (1 diff)
• editing/TextIterator.cpp (modified) (1 diff)
• rendering/InlineBox.cpp (modified) (1 diff)
• rendering/InlineIterator.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• rendering/RenderCounter.cpp (modified) (1 diff)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-17  Antti Koivisto  <antti@apple.com>
+
+        Add isTextOrBR() and use it
+        https://bugs.webkit.org/show_bug.cgi?id=121506
+
+        Reviewed by Darin Adler.
+
+        It is a popular test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateHoverActiveState):
+        * editing/Editor.cpp:
+        (WebCore::findFirstMarkable):
+        * editing/TextIterator.cpp:
+        (WebCore::ignoresContainerClip):
+        * rendering/InlineBox.cpp:
+        (WebCore::InlineBox::logicalHeight):
+        * rendering/InlineIterator.h:
+        (WebCore::isIteratorTarget):
+        * rendering/RenderBlock.cpp:
+        (WebCore::InlineMinMaxIterator::next):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlockFlow::layoutInlineChildren):
+        * rendering/RenderCounter.cpp:
+        (WebCore::planCounter):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isTextOrBR):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::write):
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::ascentAndDescentForBox):
+        (WebCore::RootInlineBox::verticalPositionForBox):
+
 2013-09-17  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -5825 +5825 @@
             // will need to reference this chain.
             for (RenderObject* curr = newActiveElement->renderer(); curr; curr = curr->parent()) {
-                if (!curr->node() || !curr->node()->isElementNode() || curr->isText() || curr->isBR())
+                if (!curr->node() || !curr->node()->isElementNode() || curr->isTextOrBR())
                     continue;
                 m_userActionElements.setInActiveChain(toElement(curr->node()), true);

trunk/Source/WebCore/editing/Editor.cpp

@@ -3086 +3086 @@
         if (!node->renderer())
             return 0;
-        if (node->renderer()->isText() || node->renderer()->isBR())
+        if (node->renderer()->isTextOrBR())
             return node;
         if (isHTMLTextFormControlElement(node))

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -216 +216 @@
 {
     RenderObject* renderer = node->renderer();
-    if (!renderer || renderer->isText() || renderer->isBR())
+    if (!renderer || renderer->isTextOrBR())
         return false;
     return renderer->style()->hasOutOfFlowPosition();

trunk/Source/WebCore/rendering/InlineBox.cpp

@@ -142 +142 @@
         return virtualLogicalHeight();
     
-    if (renderer().isText() || renderer().isBR())
+    if (renderer().isTextOrBR())
         return m_bitfields.isText() ? renderer().style(isFirstLineStyle())->fontMetrics().height() : 0;
     if (renderer().isBox() && parent())

trunk/Source/WebCore/rendering/InlineIterator.h

@@ -167 +167 @@
 {
     ASSERT(object); // The iterator will of course return 0, but its not an expected argument to this function.
-    return object->isText() || object->isBR() || object->isFloating() || object->isOutOfFlowPositioned() || object->isReplaced();
+    return object->isTextOrBR() || object->isFloating() || object->isOutOfFlowPositioned() || object->isReplaced();
 }
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -5101 +5101 @@
             break;
 
-        if (!result->isOutOfFlowPositioned() && (result->isText() || result->isBR() || result->isFloating() || result->isReplaced() || result->isRenderInline()))
+        if (!result->isOutOfFlowPositioned() && (result->isTextOrBR() || result->isFloating() || result->isReplaced() || result->isRenderInline()))
              break;
         

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1844 +1844 @@
                         o->layoutIfNeeded();
                 }
-            } else if (o->isText() || o->isBR() || (o->isRenderInline() && !walker.atEndOfInline())) {
+            } else if (o->isTextOrBR() || (o->isRenderInline() && !walker.atEndOfInline())) {
                 if (o->isRenderInline())
                     toRenderInline(o)->updateAlwaysCreateLineBoxes(layoutState.isFullLayout());

trunk/Source/WebCore/rendering/RenderCounter.cpp

@@ -109 +109 @@
     // Real text nodes don't have their own style so they can't have counters.
     // We can't even look at their styles or we'll see extra resets and increments!
-    if (object->isText() && !object->isBR())
+    if (object->isText())
         return false;
     Node* generatingNode = object->generatingNode();

trunk/Source/WebCore/rendering/RenderObject.h

@@ -570 +570 @@
     bool isText() const  { return !m_bitfields.isBox() && m_bitfields.isTextOrRenderView(); }
     bool isBR() const { return m_bitfields.isBR(); }
+    bool isTextOrBR() const { return isText() || isBR(); }
     bool isBox() const { return m_bitfields.isBox(); }
     bool isRenderView() const  { return m_bitfields.isBox() && m_bitfields.isTextOrRenderView(); }

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -590 +590 @@
     ts << "\n";
 
-    if (o.isText() && !o.isBR()) {
+    if (o.isText()) {
         const RenderText& text = toRenderText(o);
         for (InlineTextBox* box = text.firstTextBox(); box; box = box->nextTextBox()) {

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -916 +916 @@
         LayoutUnit ascentWithMargin = box->renderer().style(isFirstLineStyle())->fontMetrics().ascent(baselineType());
         LayoutUnit descentWithMargin = box->renderer().style(isFirstLineStyle())->fontMetrics().descent(baselineType());
-        if (box->parent() && !box->renderer().isText() && !box->renderer().isBR()) {
+        if (box->parent() && !box->renderer().isTextOrBR()) {
             ascentWithMargin += box->boxModelObject()->borderAndPaddingBefore() + box->boxModelObject()->marginBefore();
             descentWithMargin += box->boxModelObject()->borderAndPaddingAfter() + box->boxModelObject()->marginAfter();
@@ -930 +930 @@
 LayoutUnit RootInlineBox::verticalPositionForBox(InlineBox* box, VerticalPositionCache& verticalPositionCache)
 {
-    if (box->renderer().isText() || box->renderer().isBR())
+    if (box->renderer().isTextOrBR())
         return box->parent()->logicalTop();