[oilpan] Handlify Nodes in htmlediting

Source/core/editing/markup.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009, 2010, 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Igalia S.L.
  * Copyright (C) 2011 Motorola Mobility. 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
@@ skipping 151 matching lines @@
     : MarkupAccumulator(nodes, shouldResolveURLs, range)
     , m_shouldAnnotate(shouldAnnotate)
     , m_highestNodeToBeSerialized(highestNodeToBeSerialized)
 {
 }
 
 void StyledMarkupAccumulator::wrapWithNode(Node* node, bool convertBlocksToInlines, RangeFullySelectsNode rangeFullySelectsNode)
 {
     StringBuilder markup;
     if (node->isElementNode())
-        appendElement(markup, adoptRawResult(toElement(node)), convertBlocksToInlines && isBlock(const_cast<Node*>(node)), rangeFullySelectsNode);
+        appendElement(markup, adoptRawResult(toElement(node)), convertBlocksToInlines && isBlock(adoptRawResult(const_cast<Node*>(node))), rangeFullySelectsNode);
     else
         appendStartMarkup(markup, node, 0);
     m_reversedPrecedingMarkup.append(markup.toString());
     appendEndTag(node);
     if (m_nodes)
         m_nodes->append(node);
 }
 
 void StyledMarkupAccumulator::wrapWithStyleNode(const Handle<StylePropertySet>& style, const Handle<Document>& document, bool isBlock)
 {
@@ skipping 177 matching lines @@
         // past pastEnd and become null here. This shouldn't be possible.
         // This null check will prevent crashes (but create too much markup)
         // and the ASSERT will hopefully lead us to understanding the problem.
         ASSERT(n);
         if (!n)
             break;
         
         next = NodeTraversal::next(n);
         bool openedTag = false;
 
-        if (isBlock(n.raw()) && canHaveChildrenForEditing(n.raw()) && next == pastEnd)
+        if (isBlock(n) && canHaveChildrenForEditing(n) && next == pastEnd)
             // Don't write out empty block containers that aren't fully selected.
             continue;
 
-        if (!n->renderer() && !enclosingNodeWithTag(firstPositionInOrBeforeNode(n.raw()), selectTag)) {
+        if (!n->renderer() && !enclosingNodeWithTag(firstPositionInOrBeforeNode(n), selectTag)) {
             next = NodeTraversal::nextSkippingChildren(n);
             // Don't skip over pastEnd.
             if (pastEnd && pastEnd->isDescendantOf(n.raw()))
                 next = adoptRawResult(pastEnd);
         } else {
             // Add the node to the markup if we're not skipping the descendants
             if (shouldEmit)
                 appendStartTag(n.raw());
 
             // If node has no children, close the tag now.
@@ skipping 36 matching lines @@
                         wrapWithNode(parent.raw());
                     lastClosed = parent;
                 }
             }
         }
     }
 
     return lastClosed.raw();
 }
 
-static bool isHTMLBlockElement(const Node* node)
+static bool isHTMLBlockElement(const Handle<const Node>& node)
 {
     return node->hasTagName(tdTag)
         || node->hasTagName(thTag)
         || isNonTableCellHTMLBlockElement(node);
 }
 
-static Node* ancestorToRetainStructureAndAppearanceForBlock(Node* commonAncestorBlock)
+static Result<Node> ancestorToRetainStructureAndAppearanceForBlock(const Handle<Node>& commonAncestorBlock)
 {
     if (!commonAncestorBlock)
-        return 0;
+        return nullptr;
 
     if (commonAncestorBlock->hasTagName(tbodyTag) || commonAncestorBlock->hasTagName(trTag)) {
         Handle<ContainerNode> table = commonAncestorBlock->parentNode();
-        while (table && !table->hasTagName(tableTag))
+        while (table && !table->hasTagName(tableTag)) {
+            NoHandleScope scope;
             table = table->parentNode();
+        }
 
-        return table.raw();
+        return table;
     }
 
     if (isNonTableCellHTMLBlockElement(commonAncestorBlock))
         return commonAncestorBlock;
 
-    return 0;
+    return nullptr;
 }
 
-static inline Node* ancestorToRetainStructureAndAppearance(Node* commonAncestor)
+static inline Result<Node> ancestorToRetainStructureAndAppearance(const Handle<Node>& commonAncestor)
 {
-    return ancestorToRetainStructureAndAppearanceForBlock(enclosingBlock(commonAncestor).handle().raw());
+    return ancestorToRetainStructureAndAppearanceForBlock(enclosingBlock(commonAncestor));
 }
 
-static inline Node* ancestorToRetainStructureAndAppearanceWithNoRenderer(Node* commonAncestor)
+static inline Result<Node> ancestorToRetainStructureAndAppearanceWithNoRenderer(const Handle<Node>& commonAncestor)
 {
-    Node* commonAncestorBlock = enclosingNodeOfType(firstPositionInOrBeforeNode(commonAncestor), isHTMLBlockElement);
+    Handle<Node> commonAncestorBlock = enclosingNodeOfType(firstPositionInOrBeforeNode(commonAncestor), isHTMLBlockElement);
     return ancestorToRetainStructureAndAppearanceForBlock(commonAncestorBlock);
 }
 
 static bool propertyMissingOrEqualToNone(const Handle<StylePropertySet>& style, CSSPropertyID propertyID)
 {
     if (!style)
         return false;
     Handle<CSSValue> value = style->getPropertyCSSValue(propertyID);
     if (!value)
         return true;
@@ skipping 17 matching lines @@
         return 0;
 
     // FIXME: Having to const_cast here is ugly, but it is quite a bit of work to untangle
     // the non-const-ness of styleFromMatchedRulesForElement.
     Handle<HTMLElement> element = toHTMLElement(Handle<Node>::constCast(adoptRawResult(node)));
     RefPtr<EditingStyle> style = EditingStyle::createFromPropertySet(element->inlineStyle());
     style->mergeStyleFromRules(element);
     return style.release();
 }
 
-static bool isElementPresentational(const Node* node)
+static bool isElementPresentational(const Handle<const Node>& node)
 {
     return node->hasTagName(uTag) || node->hasTagName(sTag) || node->hasTagName(strikeTag)
         || node->hasTagName(iTag) || node->hasTagName(emTag) || node->hasTagName(bTag) || node->hasTagName(strongTag);
 }
 
 static Node* highestAncestorToWrapMarkup(const Handle<const Range>& range, EAnnotateForInterchange shouldAnnotate, Node* constrainingAncestor)
 {
     Handle<Node> commonAncestor = range->commonAncestorContainer(IGNORE_EXCEPTION);
     ASSERT(commonAncestor);
     Handle<Node> specialCommonAncestor;
     if (shouldAnnotate == AnnotateForInterchange) {
         // Include ancestors that aren't completely inside the range but are required to retain 
         // the structure and appearance of the copied markup.
-        specialCommonAncestor = adoptRawResult(ancestorToRetainStructureAndAppearance(commonAncestor.raw()));
+        specialCommonAncestor = ancestorToRetainStructureAndAppearance(commonAncestor);
 
-        if (Node* parentListNode = enclosingNodeOfType(firstPositionInOrBeforeNode(range->firstNode().handle().raw()), isListItem)) {
-            if (WebCore::areRangesEqual(VisibleSelection::selectionFromContentsOfNode(parentListNode).toNormalizedRange(), range)) {
+        if (Handle<Node> parentListNode = enclosingNodeOfType(firstPositionInOrBeforeNode(range->firstNode()), isListItem)) {
+            if (WebCore::areRangesEqual(VisibleSelection::selectionFromContentsOfNode(parentListNode.raw()).toNormalizedRange(), range)) {
                 specialCommonAncestor = parentListNode->parentNode();
-                while (specialCommonAncestor && !isListElement(specialCommonAncestor.raw())) {
+                while (specialCommonAncestor && !isListElement(specialCommonAncestor)) {
                     NoHandleScope scope;
                     specialCommonAncestor = specialCommonAncestor->parentNode();
                 }
             }
         }
 
         // Retain the Mail quote level by including all ancestor mail block quotes.
-        if (Handle<Node> highestMailBlockquote = adoptRawResult(highestEnclosingNodeOfType(firstPositionInOrBeforeNode(range->firstNode().handle().raw()), isMailBlockquote, CanCrossEditingBoundary)))
+        if (Handle<Node> highestMailBlockquote = highestEnclosingNodeOfType(firstPositionInOrBeforeNode(range->firstNode()), isMailBlockquote, CanCrossEditingBoundary))
             specialCommonAncestor = highestMailBlockquote;
     }
 
     Handle<Node> checkAncestor = specialCommonAncestor ? specialCommonAncestor : commonAncestor;
     if (checkAncestor->renderer()) {
-        Handle<Node> newSpecialCommonAncestor = adoptRawResult(highestEnclosingNodeOfType(firstPositionInNode(checkAncestor), &isElementPresentational, CanCrossEditingBoundary, constrainingAncestor));
+        Handle<Node> newSpecialCommonAncestor = highestEnclosingNodeOfType(firstPositionInNode(checkAncestor), &isElementPresentational, CanCrossEditingBoundary, adoptRawResult(constrainingAncestor));
         if (newSpecialCommonAncestor)
             specialCommonAncestor = newSpecialCommonAncestor;
     }
 
     // If a single tab is selected, commonAncestor will be a text node inside a tab span.
     // If two or more tabs are selected, commonAncestor will be the tab span.
     // In either case, if there is a specialCommonAncestor already, it will necessarily be above 
     // any tab span that needs to be included.
-    if (!specialCommonAncestor && isTabSpanTextNode(commonAncestor.raw()))
+    if (!specialCommonAncestor && isTabSpanTextNode(commonAncestor))
         specialCommonAncestor = commonAncestor->parentNode();
-    if (!specialCommonAncestor && isTabSpanNode(commonAncestor.raw()))
+    if (!specialCommonAncestor && isTabSpanNode(commonAncestor))
         specialCommonAncestor = commonAncestor;
 
-    if (Handle<Node> enclosingAnchor = adoptRawResult(enclosingNodeWithTag(firstPositionInNode(specialCommonAncestor ? specialCommonAncestor : commonAncestor), aTag)))
+    if (Handle<Node> enclosingAnchor = enclosingNodeWithTag(firstPositionInNode(specialCommonAncestor ? specialCommonAncestor : commonAncestor), aTag))
         specialCommonAncestor = enclosingAnchor;
 
     return specialCommonAncestor.raw();
 }
 
 // FIXME: Shouldn't we omit style info when annotate == DoNotAnnotateForInterchange? 
 // FIXME: At least, annotation and style info should probably not be included in range.markupString()
 static String createMarkupInternal(const Handle<Document>& document, const Handle<const Range>& range, const Handle<const Range>& updatedRange, Vector<Node*>* nodes,
     EAnnotateForInterchange shouldAnnotate, bool convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs, Node* constrainingAncestor)
 {
     ASSERT(document);
     ASSERT(range);
     ASSERT(updatedRange);
     DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, (ASCIILiteral("<br class=\"" AppleInterchangeNewline "\">")));
 
     bool collapsed = updatedRange->collapsed(ASSERT_NO_EXCEPTION);
     if (collapsed)
         return emptyString();
     Handle<Node> commonAncestor = updatedRange->commonAncestorContainer(ASSERT_NO_EXCEPTION);
     if (!commonAncestor)
         return emptyString();
 
     document->updateLayoutIgnorePendingStylesheets();
 
-    Node* body = enclosingNodeWithTag(firstPositionInNode(commonAncestor), bodyTag);
-    Node* fullySelectedRoot = 0;
+    Handle<Node> body = enclosingNodeWithTag(firstPositionInNode(commonAncestor), bodyTag);
+    Handle<Node> fullySelectedRoot;
     // FIXME: Do this for all fully selected blocks, not just the body.
-    if (body && areRangesEqual(VisibleSelection::selectionFromContentsOfNode(body).toNormalizedRange(), range))
+    if (body && areRangesEqual(VisibleSelection::selectionFromContentsOfNode(body.raw()).toNormalizedRange(), range))
         fullySelectedRoot = body;
-    Node* specialCommonAncestor = highestAncestorToWrapMarkup(updatedRange, shouldAnnotate, constrainingAncestor);
-    StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, updatedRange, specialCommonAncestor);
+    Handle<Node> specialCommonAncestor = adoptRawResult(highestAncestorToWrapMarkup(updatedRange, shouldAnnotate, constrainingAncestor));
+    StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, updatedRange, specialCommonAncestor.raw());
     Handle<Node> pastEnd = updatedRange->pastLastNode();
 
     Handle<Node> startNode = updatedRange->firstNode();
     VisiblePosition visibleStart(updatedRange->startPosition(), VP_DEFAULT_AFFINITY);
     VisiblePosition visibleEnd(updatedRange->endPosition(), VP_DEFAULT_AFFINITY);
     if (shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAfter(visibleStart)) {
         if (visibleStart == visibleEnd.previous())
             return interchangeNewlineString;
 
         accumulator.appendString(interchangeNewlineString);
         startNode = visibleStart.next().deepEquivalent().deprecatedNode();
 
         if (pastEnd && Range::compareBoundaryPoints(startNode, 0, pastEnd, 0, ASSERT_NO_EXCEPTION) >= 0)
             return interchangeNewlineString;
     }
 
     Node* lastClosed = accumulator.serializeNodes(startNode.raw(), pastEnd.raw());
 
     if (specialCommonAncestor && lastClosed) {
         HandleScope scope;
         // Also include all of the ancestors of lastClosed up to this special ancestor.
         for (Handle<ContainerNode> ancestor = lastClosed->parentNode(); ancestor; ancestor = ancestor->parentNode()) {
             HandleScope scope;
             if (ancestor == fullySelectedRoot && !convertBlocksToInlines) {
-                RefPtr<EditingStyle> fullySelectedRootStyle = styleFromMatchedRulesAndInlineDecl(fullySelectedRoot);
+                RefPtr<EditingStyle> fullySelectedRootStyle = styleFromMatchedRulesAndInlineDecl(fullySelectedRoot.raw());
 
                 // Bring the background attribute over, but not as an attribute because a background attribute on a div
                 // appears to have no effect.
                 if ((!fullySelectedRootStyle || !fullySelectedRootStyle->style() || !fullySelectedRootStyle->style()->getPropertyCSSValue(CSSPropertyBackgroundImage))
                     && toElement(fullySelectedRoot)->hasAttribute(backgroundAttr))
                     fullySelectedRootStyle->style()->setProperty(CSSPropertyBackgroundImage, "url('" + toElement(fullySelectedRoot)->getAttribute(backgroundAttr) + "')");
 
                 if (fullySelectedRootStyle->style()) {
                     // Reset the CSS properties to avoid an assertion error in addStyleMarkup().
                     // This assertion is caused at least when we select all text of a <body> element whose
@@ skipping 114 matching lines @@
     RefPtr<Node> nodeBeforeContext;
     RefPtr<Node> nodeAfterContext;
     if (!findNodesSurroundingContext(taggedDocument, nodeBeforeContext, nodeAfterContext))
         return nullptr;
 
     Handle<Range> range = Range::create(taggedDocument,
         positionAfterNode(adoptRawResult(nodeBeforeContext.get())).parentAnchoredEquivalent(),
         positionBeforeNode(adoptRawResult(nodeAfterContext.get())).parentAnchoredEquivalent());
 
     Handle<Node> commonAncestor = range->commonAncestorContainer(ASSERT_NO_EXCEPTION);
-    Node* specialCommonAncestor = ancestorToRetainStructureAndAppearanceWithNoRenderer(commonAncestor.raw());
+    Handle<Node> specialCommonAncestor = ancestorToRetainStructureAndAppearanceWithNoRenderer(commonAncestor);
 
     // When there's a special common ancestor outside of the fragment, we must include it as well to
     // preserve the structure and appearance of the fragment. For example, if the fragment contains
     // TD, we need to include the enclosing TABLE tag as well.
     Handle<DocumentFragment> fragment = DocumentFragment::create(document);
     if (specialCommonAncestor)
-        fragment->appendChild(adoptRawResult(specialCommonAncestor), ASSERT_NO_EXCEPTION);
+        fragment->appendChild(specialCommonAncestor, ASSERT_NO_EXCEPTION);
     else
         fragment->takeAllChildrenFrom(toContainerNode(commonAncestor));
 
     trimFragment(fragment, nodeBeforeContext.get(), nodeAfterContext.get());
 
     return fragment;
 }
 
 String createMarkup(const Node* node, EChildrenOnly childrenOnly, Vector<Node*>* nodes, EAbsoluteURLs shouldResolveURLs, Vector<QualifiedName>* tagNamesToSkip)
 {
@@ skipping 46 matching lines @@
 }
 
 bool isPlainTextMarkup(Node *node)
 {
     if (!node->isElementNode() || !node->hasTagName(divTag) || toElement(node)->hasAttributes())
         return false;
     
     if (node->childNodeCount() == 1 && (node->firstChild()->isTextNode() || (node->firstChild()->firstChild())))
         return true;
     
-    return (node->childNodeCount() == 2 && isTabSpanTextNode(node->firstChild()->firstChild().handle().raw()) && node->firstChild()->nextSibling()->isTextNode());
+    return (node->childNodeCount() == 2 && isTabSpanTextNode(node->firstChild()->firstChild()) && node->firstChild()->nextSibling()->isTextNode());
 }
 
 Result<DocumentFragment> createFragmentFromText(const Handle<Range>& context, const String& text)
 {
     if (!context)
         return nullptr;
 
     Handle<Node> styleNode = context->firstNode();
     if (!styleNode) {
         styleNode = context->startPosition().deprecatedNode();
@@ skipping 22 matching lines @@
         return fragment;
     }
 
     // A string with no newlines gets added inline, rather than being put into a paragraph.
     if (string.find('\n') == notFound) {
         fillContainerFromString(fragment, string);
         return fragment;
     }
 
     // Break string into paragraphs. Extra line breaks turn into empty paragraphs.
-    Handle<Node> blockNode = enclosingBlock(context->firstNode().handle().raw());
+    Handle<Node> blockNode = enclosingBlock(context->firstNode());
     Handle<Element> block = toElement(blockNode);
     bool useClonesOfEnclosingBlock = blockNode
         && blockNode->isElementNode()
         && !block->hasTagName(bodyTag)
         && !block->hasTagName(htmlTag)
         && block != editableRootForPosition(context->startPosition());
     bool useLineBreak = enclosingTextFormControl(context->startPosition());
 
     Vector<String> list;
     string.split('\n', true, list); // true gets us empty strings in the list
@@ skipping 234 matching lines @@
     if (hasOneChild(containerNode)) {
         containerNode->replaceChild(textNode, containerNode->firstChild(), ec);
         return;
     }
 
     containerNode->removeChildren();
     containerNode->appendChild(textNode, ec);
 }
 
 }