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

Unified Diff: Source/core/editing/DeleteSelectionCommand.h

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/DeleteFromTextNodeCommand.cpp ('k') | Source/core/editing/DeleteSelectionCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/DeleteSelectionCommand.h
diff --git a/Source/core/editing/DeleteSelectionCommand.h b/Source/core/editing/DeleteSelectionCommand.h
index 5d3b394f45a624ab069997a4ef094d4569d8d403..8bef5717c47186871c75cdeb9dcac5716fc05d58 100644
--- a/Source/core/editing/DeleteSelectionCommand.h
+++ b/Source/core/editing/DeleteSelectionCommand.h
@@ -34,15 +34,17 @@ class EditingStyle;
class DeleteSelectionCommand FINAL : public CompositeEditCommand {
public:
- static PassRefPtr<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
+ static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(Document& document, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
{
- return adoptRef(new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
+ return adoptRefWillBeNoop(new DeleteSelectionCommand(document, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
}
- static PassRefPtr<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
+ static PassRefPtrWillBeRawPtr<DeleteSelectionCommand> create(const VisibleSelection& selection, bool smartDelete = false, bool mergeBlocksAfterDelete = true, bool expandForSpecialElements = false, bool sanitizeMarkup = true)
{
- return adoptRef(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
+ return adoptRefWillBeNoop(new DeleteSelectionCommand(selection, smartDelete, mergeBlocksAfterDelete, expandForSpecialElements, sanitizeMarkup));
}
+ virtual void trace(Visitor*) OVERRIDE;
+
private:
DeleteSelectionCommand(Document&, bool smartDelete, bool mergeBlocksAfterDelete, bool expandForSpecialElements, bool santizeMarkup);
DeleteSelectionCommand(const VisibleSelection&, bool smartDelete, bool mergeBlocksAfterDelete, bool expandForSpecialElements, bool sanitizeMarkup);
@@ -64,7 +66,7 @@ private:
void calculateTypingStyleAfterDelete();
void clearTransientState();
void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss();
- virtual void removeNode(PassRefPtr<Node>, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) OVERRIDE;
+ virtual void removeNode(PassRefPtrWillBeRawPtr<Node>, ShouldAssumeContentIsAlwaysEditable = DoNotAssumeContentIsAlwaysEditable) OVERRIDE;
virtual void deleteTextFromNode(PassRefPtrWillBeRawPtr<Text>, unsigned, unsigned) OVERRIDE;
void removeRedundantBlocks();
@@ -86,15 +88,15 @@ private:
Position m_endingPosition;
Position m_leadingWhitespace;
Position m_trailingWhitespace;
- RefPtr<Node> m_startBlock;
- RefPtr<Node> m_endBlock;
- RefPtr<EditingStyle> m_typingStyle;
- RefPtr<EditingStyle> m_deleteIntoBlockquoteStyle;
- RefPtr<Node> m_startRoot;
- RefPtr<Node> m_endRoot;
- RefPtr<Node> m_startTableRow;
- RefPtr<Node> m_endTableRow;
- RefPtr<Node> m_temporaryPlaceholder;
+ RefPtrWillBeMember<Node> m_startBlock;
+ RefPtrWillBeMember<Node> m_endBlock;
+ RefPtrWillBeMember<EditingStyle> m_typingStyle;
+ RefPtrWillBeMember<EditingStyle> m_deleteIntoBlockquoteStyle;
+ RefPtrWillBeMember<Node> m_startRoot;
+ RefPtrWillBeMember<Node> m_endRoot;
+ RefPtrWillBeMember<Node> m_startTableRow;
+ RefPtrWillBeMember<Node> m_endTableRow;
+ RefPtrWillBeMember<Node> m_temporaryPlaceholder;
};
} // namespace WebCore
« no previous file with comments | « Source/core/editing/DeleteFromTextNodeCommand.cpp ('k') | Source/core/editing/DeleteSelectionCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698