| Index: Source/core/editing/Editor.h
|
| diff --git a/Source/core/editing/Editor.h b/Source/core/editing/Editor.h
|
| index 4008c057e7b4c601d9184f38cec3514b46b3333b..12767005b0d0ae4972526af35f523a4e0371fedc 100644
|
| --- a/Source/core/editing/Editor.h
|
| +++ b/Source/core/editing/Editor.h
|
| @@ -71,7 +71,7 @@ public:
|
|
|
| EditorClient& client() const;
|
|
|
| - LocalFrame& frame() const { return m_frame; }
|
| + LocalFrame& frame() const { return *m_frame; }
|
|
|
| CompositeEditCommand* lastEditCommand() { return m_lastEditCommand.get(); }
|
|
|
| @@ -130,9 +130,10 @@ public:
|
| bool shouldStyleWithCSS() const { return m_shouldStyleWithCSS; }
|
|
|
| class Command {
|
| + STACK_ALLOCATED();
|
| public:
|
| Command();
|
| - Command(const EditorInternalCommand*, EditorCommandSource, PassRefPtr<LocalFrame>);
|
| + Command(const EditorInternalCommand*, EditorCommandSource, PassRefPtrWillBeRawPtr<LocalFrame>);
|
|
|
| bool execute(const String& parameter = String(), Event* triggeringEvent = 0) const;
|
| bool execute(Event* triggeringEvent) const;
|
| @@ -150,7 +151,7 @@ public:
|
| private:
|
| const EditorInternalCommand* m_command;
|
| EditorCommandSource m_source;
|
| - RefPtr<LocalFrame> m_frame;
|
| + RefPtrWillBeMember<LocalFrame> m_frame;
|
| };
|
| Command command(const String& commandName); // Command source is CommandFromMenuOrKeyBinding.
|
| Command command(const String& commandName, EditorCommandSource);
|
| @@ -238,7 +239,7 @@ public:
|
| void trace(Visitor*);
|
|
|
| private:
|
| - LocalFrame& m_frame;
|
| + RawPtrWillBeMember<LocalFrame> m_frame;
|
| RefPtrWillBeMember<CompositeEditCommand> m_lastEditCommand;
|
| int m_preventRevealSelection;
|
| bool m_shouldStartNewKillRingSequence;
|
|
|