| Index: third_party/WebKit/Source/core/editing/Editor.h
|
| diff --git a/third_party/WebKit/Source/core/editing/Editor.h b/third_party/WebKit/Source/core/editing/Editor.h
|
| index 41a5b49adfbada602f5f88053a4315443332699a..3d3263914221d7358e605ab7e4fd5982eb4ed11a 100644
|
| --- a/third_party/WebKit/Source/core/editing/Editor.h
|
| +++ b/third_party/WebKit/Source/core/editing/Editor.h
|
| @@ -44,7 +44,6 @@
|
| namespace blink {
|
|
|
| class CompositeEditCommand;
|
| -class DragData;
|
| class EditCommandComposition;
|
| class EditorClient;
|
| class EditorInternalCommand;
|
| @@ -130,6 +129,7 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| void applyStyleToSelection(StylePropertySet*, InputEvent::InputType);
|
| void applyParagraphStyleToSelection(StylePropertySet*, InputEvent::InputType);
|
|
|
| + bool willApplyEditing(CompositeEditCommand*);
|
| void appliedEditing(CompositeEditCommand*);
|
| void unappliedEditing(EditCommandComposition*);
|
| void reappliedEditing(EditCommandComposition*);
|
| @@ -165,10 +165,6 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| return *m_frame;
|
| }
|
|
|
| - // Returns target ranges for the command, currently only supports delete
|
| - // related commands. Used by InputEvent.
|
| - RangeVector* getTargetRanges() const;
|
| -
|
| const EditorInternalCommand* m_command;
|
| EditorCommandSource m_source;
|
| Member<LocalFrame> m_frame;
|
| @@ -266,19 +262,6 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| InsertMode,
|
| DragSourceType);
|
|
|
| - // Return false if frame was destroyed by event handler, should stop executing
|
| - // remaining actions.
|
| - bool deleteSelectionAfterDraggingWithEvents(
|
| - Element* dragSource,
|
| - DeleteMode,
|
| - const Position& referenceMovePosition);
|
| - bool replaceSelectionAfterDraggingWithEvents(Element* dropTarget,
|
| - DragData*,
|
| - DocumentFragment*,
|
| - Range* dropCaretRange,
|
| - InsertMode,
|
| - DragSourceType);
|
| -
|
| EditorParagraphSeparator defaultParagraphSeparator() const {
|
| return m_defaultParagraphSeparator;
|
| }
|
| @@ -317,6 +300,7 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| bool m_areMarkedTextMatchesHighlighted;
|
| EditorParagraphSeparator m_defaultParagraphSeparator;
|
| bool m_overwriteModeEnabled;
|
| + bool m_executingCommandFromDOM;
|
|
|
| explicit Editor(LocalFrame&);
|
|
|
|
|