Changeset 116798 in webkit
- Timestamp:
- May 11, 2012 1:09:13 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r116797 r116798 1 2012-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 1 39 2012-05-11 Shawn Singh <shawnsingh@chromium.org> 2 40 -
trunk/Source/WebCore/dom/Document.cpp
r116746 r116798 3690 3690 return true; 3691 3691 3692 if (oldFocusedNode == oldFocusedNode->rootEditableElement())3692 if (oldFocusedNode->isRootEditableElement()) 3693 3693 frame()->editor()->didEndEditing(); 3694 3694 … … 3703 3703 3704 3704 if (newFocusedNode) { 3705 if (newFocusedNode == newFocusedNode->rootEditableElement() && !acceptsEditingFocus(newFocusedNode.get())) {3705 if (newFocusedNode->isRootEditableElement() && !acceptsEditingFocus(newFocusedNode.get())) { 3706 3706 // delegate blocks focus change 3707 3707 focusChangeBlocked = true; … … 3739 3739 m_focusedNode->setFocus(true); 3740 3740 3741 if (m_focusedNode == m_focusedNode->rootEditableElement())3741 if (m_focusedNode->isRootEditableElement()) 3742 3742 frame()->editor()->didBeginEditing(); 3743 3743 -
trunk/Source/WebCore/dom/Element.cpp
r116730 r116798 1589 1589 void Element::updateFocusAppearance(bool /*restorePreviousSelection*/) 1590 1590 { 1591 if ( this == rootEditableElement()) {1591 if (isRootEditableElement()) { 1592 1592 Frame* frame = document()->frame(); 1593 1593 if (!frame) -
trunk/Source/WebCore/dom/Node.cpp
r116742 r116798 1568 1568 } 1569 1569 1570 bool Node::isRootEditableElement() const 1571 { 1572 return rendererIsEditable() && isElementNode() && (!parentNode() || !parentNode()->rendererIsEditable() || hasTagName(bodyTag)); 1573 } 1574 1570 1575 Element* Node::rootEditableElement(EditableType editableType) const 1571 1576 { -
trunk/Source/WebCore/dom/Node.h
r116742 r116798 272 272 // enclosingBlockFlowElement() is deprecated. Use enclosingBlock instead. 273 273 Element* enclosingBlockFlowElement() const; 274 274 275 bool isRootEditableElement() const; 275 276 Element* rootEditableElement() const; 276 277 Element* rootEditableElement(EditableType) const; -
trunk/Source/WebCore/editing/CompositeEditCommand.cpp
r116368 r116798 972 972 RefPtr<Node> outerNode = passedOuterNode; 973 973 974 if (outerNode == outerNode->rootEditableElement()) {974 if (outerNode->isRootEditableElement()) { 975 975 topNode = blockElement; 976 976 lastNode = blockElement; -
trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp
r116653 r116798 353 353 } 354 354 355 if (isTableStructureNode(node.get()) || node == node->rootEditableElement()) {355 if (isTableStructureNode(node.get()) || node->isRootEditableElement()) { 356 356 // Do not remove an element of table structure; remove its contents. 357 357 // Likewise for the root editable element. -
trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp
r116653 r116798 202 202 // Create block to be inserted. 203 203 RefPtr<Element> blockToInsert; 204 if (startBlock == startBlock->rootEditableElement()) {204 if (startBlock->isRootEditableElement()) { 205 205 blockToInsert = createDefaultParagraphElement(document()); 206 206 nestNewBlock = true; -
trunk/Source/WebCore/page/FocusController.cpp
r116730 r116798 612 612 613 613 // FIXME: Might want to disable this check for caretBrowsing 614 if (oldFocusedNode && oldFocusedNode-> rootEditableElement() == oldFocusedNode&& !relinquishesEditingFocus(oldFocusedNode))614 if (oldFocusedNode && oldFocusedNode->isRootEditableElement() && !relinquishesEditingFocus(oldFocusedNode)) 615 615 return false; 616 616 -
trunk/Source/WebCore/rendering/RenderBlock.cpp
r116788 r116798 5699 5699 return false; 5700 5700 5701 if (node()-> rendererIsEditable() && node()->rootEditableElement() == node())5701 if (node()->isRootEditableElement()) 5702 5702 return true; 5703 5703 -
trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp
r116723 r116798 2669 2669 LayoutUnit endPadding = hasOverflowClip() ? paddingEnd() : ZERO_LAYOUT_UNIT; 2670 2670 // 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()) 2672 2672 endPadding = 1; 2673 2673 for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBox()) {
Note: See TracChangeset
for help on using the changeset viewer.