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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/EditorCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/Editor.cpp
diff --git a/Source/core/editing/Editor.cpp b/Source/core/editing/Editor.cpp
index a8cee6762a4783273eecb83f1f3eb2f4fa9b298c..6535f5aa5b760cb9f9fdd6166906bd0110e27d32 100644
--- a/Source/core/editing/Editor.cpp
+++ b/Source/core/editing/Editor.cpp
@@ -722,7 +722,7 @@ void Editor::unappliedEditing(PassRefPtr<EditCommandComposition> cmd)
VisibleSelection newSelection(cmd->startingSelection());
changeSelectionAfterCommand(newSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
- m_lastEditCommand = 0;
+ m_lastEditCommand = nullptr;
if (UndoStack* undoStack = this->undoStack())
undoStack->registerRedoStep(cmd);
respondToChangedContents(newSelection);
@@ -738,7 +738,7 @@ void Editor::reappliedEditing(PassRefPtr<EditCommandComposition> cmd)
VisibleSelection newSelection(cmd->endingSelection());
changeSelectionAfterCommand(newSelection, FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle);
- m_lastEditCommand = 0;
+ m_lastEditCommand = nullptr;
if (UndoStack* undoStack = this->undoStack())
undoStack->registerUndoStep(cmd);
respondToChangedContents(newSelection);
@@ -1131,7 +1131,7 @@ PassRefPtr<Range> Editor::findStringAndScrollToVisible(const String& target, Ran
{
RefPtr<Range> nextMatch = rangeOfString(target, previousMatch, options);
if (!nextMatch)
- return 0;
+ return nullptr;
nextMatch->firstNode()->renderer()->scrollRectToVisible(nextMatch->boundingBox(),
ScrollAlignment::alignCenterIfNeeded, ScrollAlignment::alignCenterIfNeeded);
@@ -1142,7 +1142,7 @@ PassRefPtr<Range> Editor::findStringAndScrollToVisible(const String& target, Ran
PassRefPtr<Range> Editor::rangeOfString(const String& target, Range* referenceRange, FindOptions options)
{
if (target.isEmpty())
- return 0;
+ return nullptr;
// Start from an edge of the reference range, if there's a reference range that's not in shadow content. Which edge
// is used depends on whether we're searching forward or backward, and whether startInSelection is set.
@@ -1207,7 +1207,7 @@ PassRefPtr<Range> Editor::rangeOfString(const String& target, Range* referenceRa
// this should be a success case instead, so we'll just fall through in that case.
}
- return resultRange->collapsed(ASSERT_NO_EXCEPTION) ? 0 : resultRange.release();
+ return resultRange->collapsed(ASSERT_NO_EXCEPTION) ? nullptr : resultRange.release();
}
void Editor::setMarkedTextMatchesAreHighlighted(bool flag)
« no previous file with comments | « Source/core/editing/EditingStyle.cpp ('k') | Source/core/editing/EditorCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698