[oilpan] Handlify Nodes in htmlediting

Source/core/editing/FrameSelection.cpp

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 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 376 matching lines @@
 
 void FrameSelection::respondToNodeModification(Node* node, bool baseRemoved, bool extentRemoved, bool startRemoved, bool endRemoved)
 {
     bool clearRenderTreeSelection = false;
     bool clearDOMTreeSelection = false;
 
     if (startRemoved || endRemoved) {
         Position start = m_selection.start();
         Position end = m_selection.end();
         if (startRemoved)
-            updatePositionForNodeRemoval(start, node);
+            updatePositionForNodeRemoval(start, adoptRawResult(node));
         if (endRemoved)
-            updatePositionForNodeRemoval(end, node);
+            updatePositionForNodeRemoval(end, adoptRawResult(node));
 
         if (start.isNotNull() && end.isNotNull()) {
             if (m_selection.isBaseFirst())
                 m_selection.setWithoutValidation(start, end);
             else
                 m_selection.setWithoutValidation(end, start);
         } else
             clearDOMTreeSelection = true;
 
         clearRenderTreeSelection = true;
@@ skipping 809 matching lines @@
 {
     const bool selectionHasDirection = true;
     setSelection(VisibleSelection(m_selection.base(), pos, affinity, selectionHasDirection), CloseTyping | ClearTypingStyle | userTriggered);
 }
 
 void CaretBase::clearCaretRect()
 {
     m_caretLocalRect = LayoutRect();
 }
 
-static inline bool caretRendersInsideNode(Node* node)
+static inline bool caretRendersInsideNode(const Handle<Node>& node)
 {
     return node && !isTableElement(node) && !editingIgnoresContent(node);
 }
 
 static RenderObject* caretRenderer(Node* node)
 {
     if (!node)
         return 0;
 
     RenderObject* renderer = node->renderer();
     if (!renderer)
         return 0;
 
     // if caretNode is a block and caret is inside it then caret should be painted by that block
-    bool paintedByBlock = renderer->isBlockFlow() && caretRendersInsideNode(node);
+    bool paintedByBlock = renderer->isBlockFlow() && caretRendersInsideNode(adoptRawResult(node));
     return paintedByBlock ? renderer : renderer->containingBlock();
 }
 
 bool CaretBase::updateCaretRect(const Handle<Document>& document, const VisiblePosition& caretPosition)
 {
     document->updateStyleIfNeeded();
     m_caretLocalRect = LayoutRect();
 
     m_caretRectNeedsUpdate = false;
 
@@ skipping 346 matching lines @@
         Handle<HTMLSelectElement> selectElement = toHTMLSelectElement(document->focusedNode());
         if (selectElement->canSelectAll()) {
             selectElement->selectAll();
             return;
         }
     }
 
     Handle<Node> root;
     Handle<Node> selectStartTarget;
     if (isContentEditable()) {
-        root = adoptRawResult(highestEditableRoot(m_selection.start()));
+        root = highestEditableRoot(m_selection.start());
         if (Node* shadowRoot = m_selection.nonBoundaryShadowTreeRootNode())
             selectStartTarget = shadowRoot->shadowHost();
         else
             selectStartTarget = root;
     } else {
         root = adoptRawResult(m_selection.nonBoundaryShadowTreeRootNode());
         if (root)
             selectStartTarget = root->shadowHost();
         else {
             root = document->documentElement();
@@ skipping 220 matching lines @@
     return widget && widget->isFrameView();
 }
 
 void FrameSelection::setFocusedNodeIfNeeded()
 {
     if (isNone() || !isFocused())
         return;
 
     bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
     if (caretBrowsing) {
-        if (Node* anchor = enclosingAnchorElement(base())) {
-            m_frame->page()->focusController()->setFocusedNode(adoptRawResult(anchor), m_frame);
+        if (Handle<Node> anchor = enclosingAnchorElement(base())) {
+            m_frame->page()->focusController()->setFocusedNode(anchor, m_frame);
             return;
         }
     }
 
     if (Handle<Node> target = rootEditableElement()) {
         // Walk up the DOM tree to search for a node to focus. 
         while (target) {
             // We don't want to set focus on a subframe when selecting in a parent frame,
             // so add the !isFrameElement check here. There's probably a better way to make this
             // work in the long term, but this is the safest fix at this time.
@@ skipping 136 matching lines @@
     bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
     if (!isNone() || !(document->rendererIsEditable() || caretBrowsing))
         return;
 
     Handle<Node> node = document->documentElement();
     while (node && !node->hasTagName(bodyTag)) {
         HandleScope scope;
         node = NodeTraversal::next(node);
     }
     if (node)
-        setSelection(VisibleSelection(firstPositionInOrBeforeNode(node.raw()), DOWNSTREAM));
+        setSelection(VisibleSelection(firstPositionInOrBeforeNode(node), DOWNSTREAM));
 }
 
 bool FrameSelection::shouldChangeSelection(const VisibleSelection& newSelection) const
 {
     return m_frame->editor()->shouldChangeSelection(selection(), newSelection, newSelection.affinity(), false);
 }
 
 bool FrameSelection::dispatchSelectStart()
 {
     Handle<Node> selectStartTarget = m_selection.extent().containerNode();
@@ skipping 32 matching lines @@
     sel.showTreeForThis();
 }
 
 void showTree(const WebCore::FrameSelection* sel)
 {
     if (sel)
         sel->showTreeForThis();
 }
 
 #endif