Changeset 81220 in webkit

Timestamp:

Mar 15, 2011 11:21:39 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-03-15 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

Devirtualize isContentEditable and isRichlyContentEditable
​https://bugs.webkit.org/show_bug.cgi?id=56421

Rewrote Node::isContentEditable as a non-recursive non-virtual function.

• dom/Document.cpp: Removed isContentEditable and isContentRichlyEditable.
• dom/Document.h: Ditto.
• dom/Node.cpp: (WebCore::Node::isContentEditable): Rewritten.
• dom/Node.h: (WebCore::Node::isContentEditable): Calls isContentEditable(Editable). (WebCore::Node::isContentRichlyEditable): Calls isContentEditable(RichlyEditable).
• html/HTMLElement.cpp: Removed isContentEditable and isContentRichlyEditable.
• html/HTMLElement.h: Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (2 diffs)
• html/HTMLElement.cpp (modified) (1 diff)
• html/HTMLElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-15  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Devirtualize isContentEditable and isRichlyContentEditable
+        https://bugs.webkit.org/show_bug.cgi?id=56421
+
+        Rewrote Node::isContentEditable as a non-recursive non-virtual function.
+
+        * dom/Document.cpp: Removed isContentEditable and isContentRichlyEditable.
+        * dom/Document.h: Ditto.
+        * dom/Node.cpp:
+        (WebCore::Node::isContentEditable): Rewritten.
+        * dom/Node.h:
+        (WebCore::Node::isContentEditable): Calls isContentEditable(Editable).
+        (WebCore::Node::isContentRichlyEditable): Calls isContentEditable(RichlyEditable).
+        * html/HTMLElement.cpp: Removed isContentEditable and isContentRichlyEditable.
+        * html/HTMLElement.h: Ditto.
+
 2011-03-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4118 +4118 @@
 }
 
-bool Document::isContentEditable() const
-{
-    if (inDesignMode())
-        return true;
-
-    return renderer() && (renderer()->style()->userModify() == READ_WRITE || renderer()->style()->userModify() == READ_WRITE_PLAINTEXT_ONLY);
-}
-
-bool Document::isContentRichlyEditable() const
-{
-    if (inDesignMode())
-        return true;
-
-    return renderer() && renderer()->style()->userModify() == READ_WRITE;
-}
-
 Document* Document::parentDocument() const
 {

trunk/Source/WebCore/dom/Document.h

@@ -895 +895 @@
     InheritedBool getDesignMode() const;
     bool inDesignMode() const;
-    virtual bool isContentEditable() const;
-    virtual bool isContentRichlyEditable() const;
 
     Document* parentDocument() const;

trunk/Source/WebCore/dom/Node.cpp

@@ -712 +712 @@
 }
 
-bool Node::isContentEditable() const
-{
-    return parentOrHostNode() && parentOrHostNode()->isContentEditable();
-}
-
-bool Node::isContentRichlyEditable() const
-{
-    return parentOrHostNode() && parentOrHostNode()->isContentRichlyEditable();
+bool Node::isContentEditable(EditableLevel editableLevel) const
+{
+    if (document()->inDesignMode())
+        return true;
+
+    // Ideally we'd call ASSERT(!needsStyleRecalc()) here, but
+    // ContainerNode::setFocus() calls setNeedsStyleRecalc(), so the assertion
+    // would fire in the middle of Document::setFocusedNode().
+
+    for (const Node* node = this; node; ) {
+        if (node->isHTMLElement() || node->isDocumentNode()) {
+            if (node->renderer()) {
+                if (editableLevel == RichlyEditable)
+                    return node->renderer()->style()->userModify() == READ_WRITE;
+
+                EUserModify userModify = node->renderer()->style()->userModify();
+                return userModify == READ_WRITE || userModify == READ_WRITE_PLAINTEXT_ONLY;
+            }
+            node = node->parentNode();
+        } else {
+            // FIXME: Should this be parentNode() instead?
+            node = node->parentOrHostNode();
+        }
+    }
+
+    return false;
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -328 +328 @@
     virtual bool isMouseFocusable() const;
 
-    virtual bool isContentEditable() const;
-    virtual bool isContentRichlyEditable() const;
+    bool isContentEditable() const { return isContentEditable(Editable); }
+    bool isContentRichlyEditable() const { return isContentEditable(RichlyEditable); }
     virtual bool shouldUseInputMethod() const;
     virtual IntRect getRect() const;
@@ -660 +660 @@
 #endif
 
+    enum EditableLevel { Editable, RichlyEditable };
+    bool isContentEditable(EditableLevel) const;
+
     void setStyleChange(StyleChangeType);
 

trunk/Source/WebCore/html/HTMLElement.cpp

@@ -658 +658 @@
 }
 
-bool HTMLElement::isContentEditable() const 
-{
-    if (document()->inDesignMode())
-        return true;
-
-    // Ideally we'd call ASSERT!needsStyleRecalc()) here, but
-    // ContainerNode::setFocus() calls setNeedsStyleRecalc(), so the assertion
-    // would fire in the middle of Document::setFocusedNode().
-
-    if (!renderer()) {
-        if (parentNode())
-            return parentNode()->isContentEditable();
-        else
-            return false;
-    }
-    
-    return renderer()->style()->userModify() == READ_WRITE || renderer()->style()->userModify() == READ_WRITE_PLAINTEXT_ONLY;
-}
-
-bool HTMLElement::isContentRichlyEditable() const
-{
-    if (document()->inDesignMode())
-        return true;
-
-    if (!renderer()) {
-        if (parentNode())
-            return parentNode()->isContentEditable();
-        else
-            return false;
-    }
-    
-    return renderer()->style()->userModify() == READ_WRITE;
-}
-
 String HTMLElement::contentEditable() const 
 {

trunk/Source/WebCore/html/HTMLElement.h

@@ -57 +57 @@
 
     virtual bool supportsFocus() const;
-    
-    virtual bool isContentEditable() const;
-    virtual bool isContentRichlyEditable() const;
 
     String contentEditable() const;