Changeset 116798 in webkit


Ignore:
Timestamp:
May 11, 2012 1:09:13 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Add helper function for node()->rootEditableElement() == node()
https://bugs.webkit.org/show_bug.cgi?id=86217

Patch by Shezan Baig <shezbaig.wk@gmail.com> on 2012-05-11
Reviewed by Ryosuke Niwa.

Added Node::isRootEditableElement and updated existing code that did
(node->rootEditableElement() == node) to use isRootEditableElement
instead.

No new tests. No change in behavior.

  • dom/Node.cpp:

(WebCore::Node::isRootEditableElement):
(WebCore):

  • dom/Node.h:

(Node):
Added new helper function.

  • dom/Document.cpp:

(WebCore::Document::setFocusedNode):

  • dom/Element.cpp:

(WebCore::Element::updateFocusAppearance):

  • editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):

  • editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::removeNode):

  • editing/InsertParagraphSeparatorCommand.cpp:

(WebCore::InsertParagraphSeparatorCommand::doApply):

  • page/FocusController.cpp:

(WebCore::FocusController::setFocusedNode):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::hasLineIfEmpty):

  • rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::addOverflowFromInlineChildren):
Updates to existing code to use the new helper function.

Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r116797 r116798  
     12012-05-11  Shezan Baig  <shezbaig.wk@gmail.com>
     2
     3        Add helper function for node()->rootEditableElement() == node()
     4        https://bugs.webkit.org/show_bug.cgi?id=86217
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Added Node::isRootEditableElement and updated existing code that did
     9        (node->rootEditableElement() == node) to use isRootEditableElement
     10        instead.
     11
     12        No new tests. No change in behavior.
     13
     14        * dom/Node.cpp:
     15        (WebCore::Node::isRootEditableElement):
     16        (WebCore):
     17        * dom/Node.h:
     18        (Node):
     19        Added new helper function.
     20
     21        * dom/Document.cpp:
     22        (WebCore::Document::setFocusedNode):
     23        * dom/Element.cpp:
     24        (WebCore::Element::updateFocusAppearance):
     25        * editing/CompositeEditCommand.cpp:
     26        (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
     27        * editing/DeleteSelectionCommand.cpp:
     28        (WebCore::DeleteSelectionCommand::removeNode):
     29        * editing/InsertParagraphSeparatorCommand.cpp:
     30        (WebCore::InsertParagraphSeparatorCommand::doApply):
     31        * page/FocusController.cpp:
     32        (WebCore::FocusController::setFocusedNode):
     33        * rendering/RenderBlock.cpp:
     34        (WebCore::RenderBlock::hasLineIfEmpty):
     35        * rendering/RenderBlockLineLayout.cpp:
     36        (WebCore::RenderBlock::addOverflowFromInlineChildren):
     37        Updates to existing code to use the new helper function.
     38
    1392012-05-11  Shawn Singh  <shawnsingh@chromium.org>
    240
  • trunk/Source/WebCore/dom/Document.cpp

    r116746 r116798  
    36903690            return true;
    36913691           
    3692         if (oldFocusedNode == oldFocusedNode->rootEditableElement())
     3692        if (oldFocusedNode->isRootEditableElement())
    36933693            frame()->editor()->didEndEditing();
    36943694
     
    37033703
    37043704    if (newFocusedNode) {
    3705         if (newFocusedNode == newFocusedNode->rootEditableElement() && !acceptsEditingFocus(newFocusedNode.get())) {
     3705        if (newFocusedNode->isRootEditableElement() && !acceptsEditingFocus(newFocusedNode.get())) {
    37063706            // delegate blocks focus change
    37073707            focusChangeBlocked = true;
     
    37393739        m_focusedNode->setFocus(true);
    37403740
    3741         if (m_focusedNode == m_focusedNode->rootEditableElement())
     3741        if (m_focusedNode->isRootEditableElement())
    37423742            frame()->editor()->didBeginEditing();
    37433743
  • trunk/Source/WebCore/dom/Element.cpp

    r116730 r116798  
    15891589void Element::updateFocusAppearance(bool /*restorePreviousSelection*/)
    15901590{
    1591     if (this == rootEditableElement()) {
     1591    if (isRootEditableElement()) {
    15921592        Frame* frame = document()->frame();
    15931593        if (!frame)
  • trunk/Source/WebCore/dom/Node.cpp

    r116742 r116798  
    15681568}
    15691569
     1570bool Node::isRootEditableElement() const
     1571{
     1572    return rendererIsEditable() && isElementNode() && (!parentNode() || !parentNode()->rendererIsEditable() || hasTagName(bodyTag));
     1573}
     1574
    15701575Element* Node::rootEditableElement(EditableType editableType) const
    15711576{
  • trunk/Source/WebCore/dom/Node.h

    r116742 r116798  
    272272    // enclosingBlockFlowElement() is deprecated. Use enclosingBlock instead.
    273273    Element* enclosingBlockFlowElement() const;
    274    
     274
     275    bool isRootEditableElement() const;
    275276    Element* rootEditableElement() const;
    276277    Element* rootEditableElement(EditableType) const;
  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r116368 r116798  
    972972    RefPtr<Node> outerNode = passedOuterNode;
    973973
    974     if (outerNode == outerNode->rootEditableElement()) {
     974    if (outerNode->isRootEditableElement()) {
    975975        topNode = blockElement;
    976976        lastNode = blockElement;
  • trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

    r116653 r116798  
    353353    }
    354354   
    355     if (isTableStructureNode(node.get()) || node == node->rootEditableElement()) {
     355    if (isTableStructureNode(node.get()) || node->isRootEditableElement()) {
    356356        // Do not remove an element of table structure; remove its contents.
    357357        // Likewise for the root editable element.
  • trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp

    r116653 r116798  
    202202    // Create block to be inserted.
    203203    RefPtr<Element> blockToInsert;
    204     if (startBlock == startBlock->rootEditableElement()) {
     204    if (startBlock->isRootEditableElement()) {
    205205        blockToInsert = createDefaultParagraphElement(document());
    206206        nestNewBlock = true;
  • trunk/Source/WebCore/page/FocusController.cpp

    r116730 r116798  
    612612
    613613    // FIXME: Might want to disable this check for caretBrowsing
    614     if (oldFocusedNode && oldFocusedNode->rootEditableElement() == oldFocusedNode && !relinquishesEditingFocus(oldFocusedNode))
     614    if (oldFocusedNode && oldFocusedNode->isRootEditableElement() && !relinquishesEditingFocus(oldFocusedNode))
    615615        return false;
    616616
  • trunk/Source/WebCore/rendering/RenderBlock.cpp

    r116788 r116798  
    56995699        return false;
    57005700   
    5701     if (node()->rendererIsEditable() && node()->rootEditableElement() == node())
     5701    if (node()->isRootEditableElement())
    57025702        return true;
    57035703   
  • trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

    r116723 r116798  
    26692669    LayoutUnit endPadding = hasOverflowClip() ? paddingEnd() : ZERO_LAYOUT_UNIT;
    26702670    // FIXME: Need to find another way to do this, since scrollbars could show when we don't want them to.
    2671     if (hasOverflowClip() && !endPadding && node() && node()->rendererIsEditable() && node() == node()->rootEditableElement() && style()->isLeftToRightDirection())
     2671    if (hasOverflowClip() && !endPadding && node() && node()->isRootEditableElement() && style()->isLeftToRightDirection())
    26722672        endPadding = 1;
    26732673    for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
Note: See TracChangeset for help on using the changeset viewer.