| Index: Source/core/editing/Editor.h
|
| diff --git a/Source/core/editing/Editor.h b/Source/core/editing/Editor.h
|
| index 9a7beecefffb41160cf0415dbe0c459286faae93..a47379015867b812777a3577f300b9257b00d05e 100644
|
| --- a/Source/core/editing/Editor.h
|
| +++ b/Source/core/editing/Editor.h
|
| @@ -63,10 +63,10 @@ class UndoStack;
|
| enum EditorCommandSource { CommandFromMenuOrKeyBinding, CommandFromDOM, CommandFromDOMWithUserInterface };
|
| enum EditorParagraphSeparator { EditorParagraphSeparatorIsDiv, EditorParagraphSeparatorIsP };
|
|
|
| -class Editor {
|
| +class Editor FINAL : public NoBaseWillBeGarbageCollectedFinalized<Editor> {
|
| WTF_MAKE_NONCOPYABLE(Editor);
|
| public:
|
| - static PassOwnPtr<Editor> create(LocalFrame&);
|
| + static PassOwnPtrWillBeRawPtr<Editor> create(LocalFrame&);
|
| ~Editor();
|
|
|
| EditorClient& client() const;
|
| @@ -126,9 +126,9 @@ public:
|
| void applyStyleToSelection(StylePropertySet*, EditAction);
|
| void applyParagraphStyleToSelection(StylePropertySet*, EditAction);
|
|
|
| - void appliedEditing(PassRefPtr<CompositeEditCommand>);
|
| - void unappliedEditing(PassRefPtr<EditCommandComposition>);
|
| - void reappliedEditing(PassRefPtr<EditCommandComposition>);
|
| + void appliedEditing(PassRefPtrWillBeRawPtr<CompositeEditCommand>);
|
| + void unappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition>);
|
| + void reappliedEditing(PassRefPtrWillBeRawPtr<EditCommandComposition>);
|
|
|
| void setShouldStyleWithCSS(bool flag) { m_shouldStyleWithCSS = flag; }
|
| bool shouldStyleWithCSS() const { return m_shouldStyleWithCSS; }
|
| @@ -234,9 +234,11 @@ public:
|
| };
|
| friend class RevealSelectionScope;
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| LocalFrame& m_frame;
|
| - RefPtr<CompositeEditCommand> m_lastEditCommand;
|
| + RefPtrWillBeMember<CompositeEditCommand> m_lastEditCommand;
|
| int m_preventRevealSelection;
|
| bool m_shouldStartNewKillRingSequence;
|
| bool m_shouldStyleWithCSS;
|
|
|