Changeset 90775 in webkit

Timestamp:

Jul 11, 2011, 12:06:34 PM (14 years ago)

Author:

rniwa@webkit.org

Message:

Move innerTextElement() from RenderTextControl to HTMLTextFormControlElement
​https://bugs.webkit.org/show_bug.cgi?id=64134

Reviewed by Kent Tamura.

Moved innerTextElement from RenderTextControl to HTMLTextFormControlElement. It is implemented by
HTMLInputElement and HTMLTextAreaElement instead of RenderTextControlSingleLine and
RenderTextControlMultiLine.

This refactoring removes the indirection through RenderTextControl and makes the ownership of
shadow DOM for input and textarea elements clear. Accessing the shadow DOM of input and textarea elements
are now less error prone because it no longer depends on the lifetime of the render tree.

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::indexForVisiblePosition): Access innerTextElement via
HTMLTextFormControlElement.

• dom/Node.cpp:

(WebCore::traverseTreeAndMark): No longer calls innerTextElement because this was a work-around
needed before making input and textarea elements use the new shadow DOM model.

• editing/TextIterator.cpp:

(WebCore::TextIterator::handleReplacedElement): Access innerTextElement via HTMLTextFormControlElement.

• html/HTMLFormControlElement.cpp:

(WebCore::hasVisibleTextArea): Takes innerTextElement.
(WebCore::HTMLTextFormControlElement::setSelectionRange): Calls innerTextElement().
(WebCore::HTMLTextFormControlElement::selection): Ditto.
(WebCore::HTMLTextFormControlElement::selectionStart): Ditto; no longer uses a temporary local variable
for innerTextElement because innerTextElement() no longer depends on the lifetime of the render tree.
(WebCore::HTMLTextFormControlElement::selectionEnd): Ditto.

• html/HTMLFormControlElement.h:
• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::innerTextElement): Added.

• html/HTMLTextAreaElement.h:
• rendering/RenderTextControl.cpp:

(WebCore::RenderTextControl::textFormControlElement): Made this function a const member.
(WebCore::RenderTextControl::innerTextElement): Added.

• rendering/RenderTextControl.h:
• rendering/RenderTextControlMultiLine.cpp:
• rendering/RenderTextControlMultiLine.h:
• rendering/RenderTextControlSingleLine.cpp:
• rendering/RenderTextControlSingleLine.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)
• editing/TextIterator.cpp (modified) (2 diffs)
• html/HTMLFormControlElement.cpp (modified) (5 diffs)
• html/HTMLFormControlElement.h (modified) (1 diff)
• html/HTMLTextAreaElement.cpp (modified) (1 diff)
• html/HTMLTextAreaElement.h (modified) (1 diff)
• rendering/RenderTextControl.cpp (modified) (1 diff)
• rendering/RenderTextControl.h (modified) (2 diffs)
• rendering/RenderTextControlMultiLine.cpp (modified) (1 diff)
• rendering/RenderTextControlMultiLine.h (modified) (1 diff)
• rendering/RenderTextControlSingleLine.cpp (modified) (1 diff)
• rendering/RenderTextControlSingleLine.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Move innerTextElement() from RenderTextControl to HTMLTextFormControlElement
+        https://bugs.webkit.org/show_bug.cgi?id=64134
+
+        Reviewed by Kent Tamura.
+
+        Moved innerTextElement from RenderTextControl to HTMLTextFormControlElement. It is implemented by
+        HTMLInputElement and HTMLTextAreaElement instead of RenderTextControlSingleLine and
+        RenderTextControlMultiLine.
+
+        This refactoring removes the indirection through RenderTextControl and makes the ownership of
+        shadow DOM for input and textarea elements clear. Accessing the shadow DOM of input and textarea elements
+        are now less error prone because it no longer depends on the lifetime of the render tree.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::indexForVisiblePosition): Access innerTextElement via
+        HTMLTextFormControlElement.
+        * dom/Node.cpp:
+        (WebCore::traverseTreeAndMark): No longer calls innerTextElement because this was a work-around
+        needed before making input and textarea elements use the new shadow DOM model.
+        * editing/TextIterator.cpp:
+        (WebCore::TextIterator::handleReplacedElement): Access innerTextElement via HTMLTextFormControlElement.
+        * html/HTMLFormControlElement.cpp:
+        (WebCore::hasVisibleTextArea): Takes innerTextElement.
+        (WebCore::HTMLTextFormControlElement::setSelectionRange): Calls innerTextElement().
+        (WebCore::HTMLTextFormControlElement::selection): Ditto.
+        (WebCore::HTMLTextFormControlElement::selectionStart): Ditto; no longer uses a temporary local variable
+        for innerTextElement because innerTextElement() no longer depends on the lifetime of the render tree.
+        (WebCore::HTMLTextFormControlElement::selectionEnd): Ditto.
+        * html/HTMLFormControlElement.h:
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::innerTextElement): Added.
+        * html/HTMLTextAreaElement.h:
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::textFormControlElement): Made this function a const member.
+        (WebCore::RenderTextControl::innerTextElement): Added.
+        * rendering/RenderTextControl.h:
+        * rendering/RenderTextControlMultiLine.cpp:
+        * rendering/RenderTextControlMultiLine.h:
+        * rendering/RenderTextControlSingleLine.cpp:
+        * rendering/RenderTextControlSingleLine.h:
+
 2011-07-11  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2494 +2494 @@
 int AccessibilityRenderObject::indexForVisiblePosition(const VisiblePosition& pos) const
 {
-    if (isNativeTextControl())
-        return RenderTextControl::indexForVisiblePosition(toRenderTextControl(m_renderer)->innerTextElement(), pos);
-    
+    if (isNativeTextControl()) {
+        HTMLTextFormControlElement* textControl = toRenderTextControl(m_renderer)->textFormControlElement();
+        return RenderTextControl::indexForVisiblePosition(textControl->innerTextElement(), pos);
+    }
+
     if (!isTextControl())
         return 0;

trunk/Source/WebCore/dom/Node.cpp

@@ -2344 +2344 @@
         ContainerNode* rootNode = shadowRoot(const_cast<Node*>(node));
 
-        if (!rootNode && node->renderer() && node->renderer()->isTextControl())
-            rootNode = static_cast<RenderTextControl*>(node->renderer())->innerTextElement();
-
         if (rootNode) {
             indent += "\t";

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -31 +31 @@
 #include "Frame.h"
 #include "HTMLElement.h"
+#include "HTMLFormControlElement.h"
 #include "HTMLNames.h"
 #include "htmlediting.h"
@@ -638 +639 @@
 
     if (m_entersTextControls && renderer->isTextControl()) {
-        if (HTMLElement* innerTextElement = toRenderTextControl(renderer)->innerTextElement()) {
+        if (HTMLElement* innerTextElement = toRenderTextControl(renderer)->textFormControlElement()->innerTextElement()) {
             m_node = innerTextElement->shadowTreeRootNode();
             pushFullyClippedState(m_fullyClippedStack, m_node);

trunk/Source/WebCore/html/HTMLFormControlElement.cpp

@@ -682 +682 @@
 }
 
-static inline bool hasVisibleTextArea(RenderTextControl* textControl)
+static inline bool hasVisibleTextArea(RenderTextControl* textControl, HTMLElement* innerText)
 {
     ASSERT(textControl);
-    HTMLElement* innerText = textControl->innerTextElement();
-    return textControl->style()->visibility() == HIDDEN || !innerText || !innerText->renderer() || !innerText->renderBox()->height();
+    return textControl->style()->visibility() != HIDDEN && innerText && innerText->renderer() && innerText->renderBox()->height();
 }
 
@@ -700 +699 @@
 
     RenderTextControl* control = toRenderTextControl(renderer());
-    if (hasVisibleTextArea(control)) {
+    if (!hasVisibleTextArea(control, innerTextElement())) {
         cacheSelection(start, end);
         return;
@@ -736 +735 @@
 {
     Frame* frame = document()->frame();
-    if (!renderer() || !frame)
-        return 0;
-
-    HTMLElement* innerText = toRenderTextControl(renderer())->innerTextElement();
-    // Do not call innerTextElement() in the function arguments as creating a VisiblePosition
-    // from frame->selection->start() can blow us from underneath. Also, function ordering is
-    // usually dependent on the compiler.
-    return RenderTextControl::indexForVisiblePosition(innerText, frame->selection()->start());
+    if (!frame)
+        return 0;
+
+    return RenderTextControl::indexForVisiblePosition(innerTextElement(), frame->selection()->start());
 }
 
@@ -758 +753 @@
 {
     Frame* frame = document()->frame();
-    if (!renderer() || !frame)
-        return 0;
-
-    HTMLElement* innerText = toRenderTextControl(renderer())->innerTextElement();
-    // Do not call innerTextElement() in the function arguments as creating a VisiblePosition
-    // from frame->selection->end() can blow us from underneath. Also, function ordering is
-    // usually dependent on the compiler.
-    return RenderTextControl::indexForVisiblePosition(innerText, frame->selection()->end());
+    if (!frame)
+        return 0;
+
+    return RenderTextControl::indexForVisiblePosition(innerTextElement(), frame->selection()->end());
 }
 
@@ -788 +779 @@
 
     ASSERT(start <= end);
-    HTMLElement* innerText = toRenderTextControl(renderer())->innerTextElement();
+    HTMLElement* innerText = innerTextElement();
     if (!innerText)
         return 0;

trunk/Source/WebCore/html/HTMLFormControlElement.h

@@ -215 +215 @@
     virtual String value() const = 0;
 
+    virtual HTMLElement* innerTextElement() const = 0;
+
     void cacheSelection(int start, int end)
     {

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -270 +270 @@
 }
 
+HTMLElement* HTMLTextAreaElement::innerTextElement() const
+{
+    Node* node = shadowRoot()->firstChild();
+    ASSERT(!node || node->hasTagName(divTag));
+    return static_cast<HTMLElement*>(node);
+}
+
 void HTMLTextAreaElement::rendererWillBeDestroyed()
 {

trunk/Source/WebCore/html/HTMLTextAreaElement.h

@@ -52 +52 @@
     bool isValidValue(const String&) const;
     
+    virtual HTMLElement* innerTextElement() const;
+
     void rendererWillBeDestroyed();
-    
+
     void setCols(int);
     void setRows(int);

trunk/Source/WebCore/rendering/RenderTextControl.cpp

@@ -83 +83 @@
 }
 
-HTMLTextFormControlElement* RenderTextControl::textFormControlElement()
+HTMLTextFormControlElement* RenderTextControl::textFormControlElement() const
 {
     return static_cast<HTMLTextFormControlElement*>(node());
+}
+
+HTMLElement* RenderTextControl::innerTextElement() const
+{
+    return textFormControlElement()->innerTextElement();
 }
 

trunk/Source/WebCore/rendering/RenderTextControl.h

@@ -36 +36 @@
     virtual ~RenderTextControl();
 
-    HTMLTextFormControlElement* textFormControlElement();
-    virtual HTMLElement* innerTextElement() const = 0;
+    HTMLTextFormControlElement* textFormControlElement() const;
     virtual PassRefPtr<RenderStyle> createInnerTextStyle(const RenderStyle* startStyle) const = 0;
 
@@ -54 +53 @@
 protected:
     RenderTextControl(Node*, bool);
+
+    // This convenience function should not be made public because innerTextElement may outlive the render tree.
+    HTMLElement* innerTextElement() const;
 
     int scrollbarThickness() const;

trunk/Source/WebCore/rendering/RenderTextControlMultiLine.cpp

@@ -43 +43 @@
     if (node() && node()->inDocument())
         static_cast<HTMLTextAreaElement*>(node())->rendererWillBeDestroyed();
-}
-
-HTMLElement* RenderTextControlMultiLine::innerTextElement() const
-{
-    return toHTMLElement(toElement(node())->shadowRoot()->firstChild());
 }
 

trunk/Source/WebCore/rendering/RenderTextControlMultiLine.h

@@ -31 +31 @@
     RenderTextControlMultiLine(Node*, bool);
     virtual ~RenderTextControlMultiLine();
-
-    virtual HTMLElement* innerTextElement() const;
 
     void forwardEvent(Event*);

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -95 +95 @@
 }
 
-inline HTMLElement* RenderTextControlSingleLine::innerTextElement() const
-{
-    return inputElement()->innerTextElement();
-}
-
 inline HTMLElement* RenderTextControlSingleLine::innerBlockElement() const
 {

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h

@@ -132 +132 @@
 
     HTMLElement* containerElement() const;
-    virtual HTMLElement* innerTextElement() const;
     HTMLElement* innerBlockElement() const;
     HTMLElement* innerSpinButtonElement() const;