Changeset 157373 in webkit

Timestamp:

Oct 13, 2013, 9:00:10 AM (11 years ago)

Author:

Antti Koivisto

Message:

Text::renderer() should return RenderText
​https://bugs.webkit.org/show_bug.cgi?id=122729

Reviewed by Andreas Kling.

Tighten typing.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Text.cpp (modified) (1 diff)
• dom/Text.h (modified) (2 diffs)
• editing/CompositeEditCommand.cpp (modified) (1 diff)
• editing/DeleteSelectionCommand.cpp (modified) (1 diff)
• editing/HTMLInterchange.cpp (modified) (1 diff)
• editing/InsertIntoTextNodeCommand.cpp (modified) (1 diff)
• editing/InsertLineBreakCommand.cpp (modified) (1 diff)
• editing/InsertParagraphSeparatorCommand.cpp (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (3 diffs)
• page/Frame.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (4 diffs)
• style/StyleResolveTree.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-13  Antti Koivisto  <antti@apple.com>
+
+        Text::renderer() should return RenderText
+        https://bugs.webkit.org/show_bug.cgi?id=122729
+
+        Reviewed by Andreas Kling.
+        
+        Tighten typing.
+
 2013-10-13  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Text.cpp

@@ -88 +88 @@
 
     if (renderer())
-        toRenderText(renderer())->setTextWithOffset(dataImpl(), 0, oldStr.length());
+        renderer()->setTextWithOffset(dataImpl(), 0, oldStr.length());
 
     return newText.release();

trunk/Source/WebCore/dom/Text.h

@@ -52 +52 @@
     virtual bool canContainRangeEndPoint() const OVERRIDE FINAL { return true; }
 
+    RenderText* renderer() const;
+
 protected:
     Text(Document& document, const String& data, ConstructionType type)
@@ -71 +73 @@
 };
 
-inline bool isText(const Node& node)
-{
-    return node.isTextNode();
-}
+void isText(const Text&); // Catch unnecessary runtime check of type known at compile time.
+void isText(const ContainerNode&); // Catch unnecessary runtime check of type known at compile time.
+inline bool isText(const Node& node) { return node.isTextNode(); }
 
 NODE_TYPE_CASTS(Text)

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -735 +735 @@
     document().updateLayout();
 
-    RenderText* textRenderer = toRenderText(textNode->renderer());
+    RenderText* textRenderer = textNode->renderer();
     if (!textRenderer)
         return;

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -40 +40 @@
 #include "NodeTraversal.h"
 #include "RenderTableCell.h"
+#include "RenderText.h"
 #include "Text.h"
 #include "VisibleUnits.h"

trunk/Source/WebCore/editing/HTMLInterchange.cpp

@@ -28 +28 @@
 
 #include "RenderElement.h"
+#include "RenderText.h"
 #include "Text.h"
 #include "TextIterator.h"

trunk/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp

@@ -58 +58 @@
 
     if (passwordEchoEnabled) {
-        RenderText* renderText = toRenderText(m_node->renderer());
+        RenderText* renderText = m_node->renderer();
         if (renderText && renderText->isSecure())
             renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.length() - 1);

trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

@@ -36 +36 @@
 #include "Range.h"
 #include "RenderElement.h"
+#include "RenderText.h"
 #include "Text.h"
 #include "VisiblePosition.h"

trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

@@ -35 +35 @@
 #include "InsertLineBreakCommand.h"
 #include "NodeTraversal.h"
-#include "RenderObject.h"
+#include "RenderText.h"
 #include "Text.h"
 #include "VisibleUnits.h"

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -668 +668 @@
 }
 
-static inline bool nodeHasVisibleRenderText(Text* text)
-{
-    return text->renderer() && toRenderText(text->renderer())->hasRenderedText();
+static inline bool hasRenderedText(const Text& text)
+{
+    return text.renderer() && text.renderer()->hasRenderedText();
 }
 
@@ -678 +678 @@
 
     Node* lastLeafInserted = insertedNodes.lastLeafInserted();
-    if (lastLeafInserted && lastLeafInserted->isTextNode() && !nodeHasVisibleRenderText(toText(lastLeafInserted))
+    if (lastLeafInserted && lastLeafInserted->isTextNode() && !hasRenderedText(toText(*lastLeafInserted))
         && !enclosingNodeWithTag(firstPositionInOrBeforeNode(lastLeafInserted), selectTag)
         && !enclosingNodeWithTag(firstPositionInOrBeforeNode(lastLeafInserted), scriptTag)) {
@@ -688 +688 @@
     // because it is a top level node in the fragment and the user can't insert into those elements.
     Node* firstNodeInserted = insertedNodes.firstNodeInserted();
-    if (firstNodeInserted && firstNodeInserted->isTextNode() && !nodeHasVisibleRenderText(toText(firstNodeInserted))) {
+    if (firstNodeInserted && firstNodeInserted->isTextNode() && !hasRenderedText(toText(*firstNodeInserted))) {
         insertedNodes.willRemoveNode(firstNodeInserted);
         removeNode(firstNodeInserted);

trunk/Source/WebCore/page/Frame.cpp

@@ -78 +78 @@
 #include "RegularExpression.h"
 #include "RenderTableCell.h"
+#include "RenderText.h"
 #include "RenderTextControl.h"
 #include "RenderTheme.h"

trunk/Source/WebCore/rendering/RenderText.h

@@ -26 +26 @@
 #include "RenderElement.h"
 #include "RenderTextLineBoxes.h"
+#include "Text.h"
 #include <wtf/Forward.h>
 
@@ -31 +32 @@
 
 class InlineTextBox;
-class Text;
 
 class RenderText : public RenderObject {
@@ -134 +134 @@
 
     InlineTextBox* findNextInlineTextBox(int offset, int& pos) const { return m_lineBoxes.findNext(offset, pos); }
-
-    void checkConsistency() const;
 
     bool isAllCollapsibleWhitespace() const;
@@ -251 +249 @@
 }
 
-#ifdef NDEBUG
-inline void RenderText::checkConsistency() const
-{
-}
-#endif
-
 void applyTextTransform(const RenderStyle*, String&, UChar);
 
+inline RenderText* Text::renderer() const
+{
+    return toRenderText(Node::renderer());
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -410 +410 @@
     if (!textNode.attached())
         return;
-    RenderText* textRenderer = toRenderText(textNode.renderer());
+    RenderText* textRenderer = textNode.renderer();
     if (!textRenderer) {
         attachTextRenderer(textNode);
@@ -629 +629 @@
 static void updateTextStyle(Text& text)
 {
-    RenderText* renderer = toRenderText(text.renderer());
+    RenderText* renderer = text.renderer();
 
     if (!text.needsStyleRecalc())