[oilpan] Handlify Nodes in htmlediting

Source/core/editing/IndentOutdentCommand.cpp

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 26 matching lines @@
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/html/HTMLElement.h"
 #include "core/rendering/RenderObject.h"
 #include <wtf/StdLibExtras.h>
 
 namespace WebCore {
 
 using namespace HTMLNames;
 
-static bool isListOrIndentBlockquote(const Node* node)
+static bool isListOrIndentBlockquote(const Handle<const Node>& node)
 {
     return node && (node->hasTagName(ulTag) || node->hasTagName(olTag) || node->hasTagName(blockquoteTag));
 }
 
 IndentOutdentCommand::IndentOutdentCommand(const Handle<Document>& document, EIndentType typeOfAction, int marginInPixels)
     : ApplyBlockElementCommand(document, blockquoteTag, "margin: 0 0 0 40px; border: none; padding: 0px;")
     , m_typeOfAction(typeOfAction)
     , m_marginInPixels(marginInPixels)
 {
 }
 
 bool IndentOutdentCommand::tryIndentingAsListItem(const Position& start, const Position& end)
 {
     // If our selection is not inside a list, bail out.
     Handle<Node> lastNodeInSelectedParagraph = start.deprecatedNode();
-    Handle<Element> listNode = enclosingList(lastNodeInSelectedParagraph.raw());
+    Handle<Element> listNode = enclosingList(lastNodeInSelectedParagraph);
     if (!listNode)
         return false;
 
     // Find the block that we want to indent.  If it's not a list item (e.g., a div inside a list item), we bail out.
-    Handle<Element> selectedListItem = enclosingBlock(lastNodeInSelectedParagraph.raw());
+    Handle<Element> selectedListItem = enclosingBlock(lastNodeInSelectedParagraph);
 
     // FIXME: we need to deal with the case where there is no li (malformed HTML)
     if (!selectedListItem->hasTagName(liTag))
         return false;
     
     // FIXME: previousElementSibling does not ignore non-rendered content like <span></span>.  Should we?
     Handle<Element> previousList = selectedListItem->previousElementSibling();
     Handle<Element> nextList = selectedListItem->nextElementSibling();
 
     Handle<Element> newList = document()->createElement(listNode->tagQName(), false);
     insertNodeBefore(newList, selectedListItem);
 
     moveParagraphWithClones(start, end, newList, selectedListItem);
 
     if (canMergeLists(previousList, newList))
         mergeIdenticalElements(previousList, newList);
     if (canMergeLists(newList, nextList))
         mergeIdenticalElements(newList, nextList);
 
     return true;
 }
 
 void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Position& end, Handle<Element>& targetBlockquote)
 {
-    Node* enclosingCell = enclosingNodeOfType(start, &isTableCell);
+    Handle<Node> enclosingCell = enclosingNodeOfType(start, &isTableCell);
     Handle<Node> nodeToSplitTo;
     if (enclosingCell)
-        nodeToSplitTo = adoptRawResult(enclosingCell);
-    else if (enclosingList(start.containerNode().handle().raw()))
-        nodeToSplitTo = enclosingBlock(start.containerNode().handle().raw());
+        nodeToSplitTo = enclosingCell;
+    else if (enclosingList(start.containerNode()))
+        nodeToSplitTo = enclosingBlock(start.containerNode());
     else
         nodeToSplitTo = editableRootForPosition(start);
 
     if (!nodeToSplitTo)
         return;
 
     Handle<Node> nodeAfterStart = start.computeNodeAfterPosition();
     Handle<Node> outerBlock = (start.containerNode() == nodeToSplitTo) ? start.containerNode() : splitTreeToNode(start.containerNode(), nodeToSplitTo);
 
     VisiblePosition startOfContents = start;
     if (!targetBlockquote) {
         // Create a new blockquote and insert it as a child of the root editable element. We accomplish
         // this by splitting all parents of the current paragraph up to that point.
         targetBlockquote = createBlockElement();
         if (outerBlock == start.containerNode().handle().raw())
             insertNodeAt(targetBlockquote, start);
         else
             insertNodeBefore(targetBlockquote, outerBlock);
         startOfContents = positionInParentAfterNode(targetBlockquote);
     }
 
     moveParagraphWithClones(startOfContents, end, targetBlockquote, outerBlock);
 }
 
 void IndentOutdentCommand::outdentParagraph()
 {
     VisiblePosition visibleStartOfParagraph = startOfParagraph(endingSelection().visibleStart());
     VisiblePosition visibleEndOfParagraph = endOfParagraph(visibleStartOfParagraph);
 
-    Handle<Node> enclosingNode = adoptRawResult(enclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), &isListOrIndentBlockquote));
+    Handle<Node> enclosingNode = enclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), &isListOrIndentBlockquote);
     if (!enclosingNode || !enclosingNode->parentNode()->rendererIsEditable()) // We can't outdent if there is no place to go!
         return;
 
     // Use InsertListCommand to remove the selection from the list
     if (enclosingNode->hasTagName(olTag)) {
         applyCommandToComposite(InsertListCommand::create(document(), InsertListCommand::OrderedList));
         return;        
     }
     if (enclosingNode->hasTagName(ulTag)) {
         applyCommandToComposite(InsertListCommand::create(document(), InsertListCommand::UnorderedList));
@@ skipping 26 matching lines @@
         document()->updateLayoutIgnorePendingStylesheets();
         visibleStartOfParagraph = VisiblePosition(visibleStartOfParagraph.deepEquivalent());
         visibleEndOfParagraph = VisiblePosition(visibleEndOfParagraph.deepEquivalent());
         if (visibleStartOfParagraph.isNotNull() && !isStartOfParagraph(visibleStartOfParagraph))
             insertNodeAt(createBreakElement(document()), visibleStartOfParagraph.deepEquivalent());
         if (visibleEndOfParagraph.isNotNull() && !isEndOfParagraph(visibleEndOfParagraph))
             insertNodeAt(createBreakElement(document()), visibleEndOfParagraph.deepEquivalent());
 
         return;
     }
-    Handle<Node> enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().deprecatedNode().handle().raw());
+    Handle<Node> enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().deprecatedNode());
     Handle<Node> splitBlockquoteNode = enclosingNode;
     if (enclosingBlockFlow != enclosingNode)
         splitBlockquoteNode = splitTreeToNode(enclosingBlockFlow, enclosingNode, true);
     else {
         // We split the blockquote at where we start outdenting.
-        Handle<Node> highestInlineNode = adoptRawResult(highestEnclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), isInline, CannotCrossEditingBoundary, enclosingBlockFlow.raw()));
+        Handle<Node> highestInlineNode = highestEnclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), isInline, CannotCrossEditingBoundary, enclosingBlockFlow);
         splitElement(toElement(enclosingNode), highestInlineNode ? highestInlineNode : visibleStartOfParagraph.deepEquivalent().deprecatedNode().handle());
     }
     Handle<Node> placeholder = createBreakElement(document());
     insertNodeBefore(placeholder, splitBlockquoteNode);
     moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), positionBeforeNode(placeholder), true);
 }
 
 // FIXME: We should merge this function with ApplyBlockElementCommand::formatSelection
 void IndentOutdentCommand::outdentRegion(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection)
 {
@@ skipping 41 matching lines @@
 
 void IndentOutdentCommand::formatRange(const Position& start, const Position& end, const Position&, Handle<Element>& blockquoteForNextIndent)
 {
     if (tryIndentingAsListItem(start, end))
         blockquoteForNextIndent = nullptr;
     else
         indentIntoBlockquote(start, end, blockquoteForNextIndent);
 }
 
 }