Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(844)

Unified Diff: Source/core/editing/Editor.cpp

Issue 24278008: [oilpan] Handlify Nodes in htmlediting (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/Editor.cpp
diff --git a/Source/core/editing/Editor.cpp b/Source/core/editing/Editor.cpp
index 659ccb9a9cd62c17ffca58692a68b1110c623d9b..da03152f5e87547c77496a61a2a7493cc0e54a5e 100644
--- a/Source/core/editing/Editor.cpp
+++ b/Source/core/editing/Editor.cpp
@@ -501,7 +501,7 @@ bool Editor::hasBidiSelection() const
if (m_frame->selection()->isRange()) {
startNode = m_frame->selection()->selection().start().downstream().deprecatedNode();
Handle<Node> endNode = m_frame->selection()->selection().end().upstream().deprecatedNode();
- if (enclosingBlock(startNode.raw()) != enclosingBlock(endNode.raw()))
+ if (enclosingBlock(startNode) != enclosingBlock(endNode))
return false;
} else
startNode = m_frame->selection()->selection().visibleStart().deepEquivalent().deprecatedNode();
@@ -526,8 +526,8 @@ TriState Editor::selectionUnorderedListState() const
if (enclosingNodeWithTag(m_frame->selection()->selection().start(), ulTag))
return TrueTriState;
} else if (m_frame->selection()->isRange()) {
- Handle<Node> startNode = adoptRawResult(enclosingNodeWithTag(m_frame->selection()->selection().start(), ulTag));
- Handle<Node> endNode = adoptRawResult(enclosingNodeWithTag(m_frame->selection()->selection().end(), ulTag));
+ Handle<Node> startNode = enclosingNodeWithTag(m_frame->selection()->selection().start(), ulTag);
+ Handle<Node> endNode = enclosingNodeWithTag(m_frame->selection()->selection().end(), ulTag);
if (startNode && endNode && startNode == endNode)
return TrueTriState;
}
@@ -541,8 +541,8 @@ TriState Editor::selectionOrderedListState() const
if (enclosingNodeWithTag(m_frame->selection()->selection().start(), olTag))
return TrueTriState;
} else if (m_frame->selection()->isRange()) {
- Handle<Node> startNode = adoptRawResult(enclosingNodeWithTag(m_frame->selection()->selection().start(), olTag));
- Handle<Node> endNode = adoptRawResult(enclosingNodeWithTag(m_frame->selection()->selection().end(), olTag));
+ Handle<Node> startNode = enclosingNodeWithTag(m_frame->selection()->selection().start(), olTag);
+ Handle<Node> endNode = enclosingNodeWithTag(m_frame->selection()->selection().end(), olTag);
if (startNode && endNode && startNode == endNode)
return TrueTriState;
}
@@ -1559,7 +1559,7 @@ void Editor::advanceToNextMisspelling(bool startBeforeSelection)
// when spell checking the whole document before sending the message.
// In that case the document might not be editable, but there are editable pockets that need to be spell checked.
- position = firstEditablePositionAfterPositionInRoot(position, frame()->document()->documentElement().handle().raw()).deepEquivalent();
+ position = firstEditablePositionAfterPositionInRoot(position, frame()->document()->documentElement()).deepEquivalent();
if (position.isNull())
return;
@@ -1569,9 +1569,9 @@ void Editor::advanceToNextMisspelling(bool startBeforeSelection)
}
// topNode defines the whole range we want to operate on
- Node* topNode = highestEditableRoot(position);
+ Handle<Node> topNode = highestEditableRoot(position);
// FIXME: lastOffsetForEditing() is wrong here if editingIgnoresContent(highestEditableRoot()) returns true (e.g. a <table>)
- spellingSearchRange->setEnd(adoptRawResult(topNode), lastOffsetForEditing(topNode), IGNORE_EXCEPTION);
+ spellingSearchRange->setEnd(topNode, lastOffsetForEditing(topNode), IGNORE_EXCEPTION);
// If spellingSearchRange starts in the middle of a word, advance to the next word so we start checking
// at a word boundary. Going back by one char and then forward by a word does the trick.
@@ -1636,7 +1636,7 @@ void Editor::advanceToNextMisspelling(bool startBeforeSelection)
// If we found neither bad grammar nor a misspelled word, wrap and try again (but don't bother if we started at the beginning of the
// block rather than at a selection).
if (startedWithSelection && !misspelledWord && !badGrammarPhrase) {
- spellingSearchRange->setStart(adoptRawResult(topNode), 0, IGNORE_EXCEPTION);
+ spellingSearchRange->setStart(topNode, 0, IGNORE_EXCEPTION);
// going until the end of the very first chunk we tested is far enough
spellingSearchRange->setEnd(searchEndNodeAfterWrap, searchEndOffsetAfterWrap, IGNORE_EXCEPTION);

Powered by Google App Engine
This is Rietveld 408576698