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

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

Issue 299353004: Oilpan: move editing objects to the heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Make test wrapper class finalized Created 6 years, 7 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/Editor.h ('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 4ba7c7b891a6e82f05235292b2d82332176700fc..e2b1faa4d1c1eab468eb37be8e8b268ae69f51ec 100644
--- a/Source/core/editing/Editor.cpp
+++ b/Source/core/editing/Editor.cpp
@@ -650,7 +650,7 @@ TriState Editor::selectionHasStyle(CSSPropertyID propertyID, const String& value
String Editor::selectionStartCSSPropertyValue(CSSPropertyID propertyID)
{
- RefPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(m_frame.selection().selection(),
+ RefPtrWillBeRawPtr<EditingStyle> selectionStyle = EditingStyle::styleAtSelectionStart(m_frame.selection().selection(),
propertyID == CSSPropertyBackgroundColor);
if (!selectionStyle || !selectionStyle->style())
return String();
@@ -672,7 +672,7 @@ void Editor::outdent()
IndentOutdentCommand::create(*m_frame.document(), IndentOutdentCommand::Outdent)->apply();
}
-static void dispatchEditableContentChangedEvents(PassRefPtr<Element> startRoot, PassRefPtr<Element> endRoot)
+static void dispatchEditableContentChangedEvents(PassRefPtrWillBeRawPtr<Element> startRoot, PassRefPtrWillBeRawPtr<Element> endRoot)
{
if (startRoot)
startRoot->dispatchEvent(Event::create(EventTypeNames::webkitEditableContentChanged), IGNORE_EXCEPTION);
@@ -680,7 +680,7 @@ static void dispatchEditableContentChangedEvents(PassRefPtr<Element> startRoot,
endRoot->dispatchEvent(Event::create(EventTypeNames::webkitEditableContentChanged), IGNORE_EXCEPTION);
}
-void Editor::appliedEditing(PassRefPtr<CompositeEditCommand> cmd)
+void Editor::appliedEditing(PassRefPtrWillBeRawPtr<CompositeEditCommand> cmd)
{
EventQueueScope scope;
m_frame.document()->updateLayout();
@@ -710,7 +710,7 @@ void Editor::appliedEditing(PassRefPtr<CompositeEditCommand> cmd)
respondToChangedContents(newSelection);
}
-void Editor::unappliedEditing(PassRefPtr<EditCommandComposition> cmd)
+void Editor::unappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition> cmd)
{
EventQueueScope scope;
m_frame.document()->updateLayout();
@@ -726,7 +726,7 @@ void Editor::unappliedEditing(PassRefPtr<EditCommandComposition> cmd)
respondToChangedContents(newSelection);
}
-void Editor::reappliedEditing(PassRefPtr<EditCommandComposition> cmd)
+void Editor::reappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition> cmd)
{
EventQueueScope scope;
m_frame.document()->updateLayout();
@@ -742,9 +742,9 @@ void Editor::reappliedEditing(PassRefPtr<EditCommandComposition> cmd)
respondToChangedContents(newSelection);
}
-PassOwnPtr<Editor> Editor::create(LocalFrame& frame)
+PassOwnPtrWillBeRawPtr<Editor> Editor::create(LocalFrame& frame)
{
- return adoptPtr(new Editor(frame));
+ return adoptPtrWillBeNoop(new Editor(frame));
}
Editor::Editor(LocalFrame& frame)
@@ -793,7 +793,7 @@ bool Editor::insertTextWithoutSendingTextEvent(const String& text, bool selectIn
selection = selectionForCommand(triggeringEvent);
if (selection.isContentEditable()) {
if (Node* selectionStart = selection.start().deprecatedNode()) {
- RefPtr<Document> document(selectionStart->document());
+ RefPtrWillBeRawPtr<Document> document(selectionStart->document());
// Insert the text
TypingCommand::Options options = 0;
@@ -1083,7 +1083,7 @@ void Editor::computeAndSetTypingStyle(StylePropertySet* style, EditAction editin
}
// Calculate the current typing style.
- RefPtr<EditingStyle> typingStyle;
+ RefPtrWillBeRawPtr<EditingStyle> typingStyle = nullptr;
if (m_frame.selection().typingStyle()) {
typingStyle = m_frame.selection().typingStyle()->copy();
typingStyle->overrideWithStyle(style);
@@ -1094,7 +1094,7 @@ void Editor::computeAndSetTypingStyle(StylePropertySet* style, EditAction editin
typingStyle->prepareToApplyAt(m_frame.selection().selection().visibleStart().deepEquivalent(), EditingStyle::PreserveWritingDirection);
// Handle block styles, substracting these from the typing style.
- RefPtr<EditingStyle> blockStyle = typingStyle->extractAndRemoveBlockProperties();
+ RefPtrWillBeRawPtr<EditingStyle> blockStyle = typingStyle->extractAndRemoveBlockProperties();
if (!blockStyle->isEmpty()) {
ASSERT(m_frame.document());
ApplyStyleCommand::create(*m_frame.document(), blockStyle.get(), editingAction)->apply();
@@ -1235,4 +1235,10 @@ void Editor::toggleOverwriteModeEnabled()
frame().selection().setShouldShowBlockCursor(m_overwriteModeEnabled);
}
+void Editor::trace(Visitor* visitor)
+{
+ visitor->trace(m_lastEditCommand);
+ visitor->trace(m_mark);
+}
+
} // namespace WebCore
« no previous file with comments | « Source/core/editing/Editor.h ('k') | Source/core/editing/EditorCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698