| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |    2  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 
|    3  * |    3  * | 
|    4  * Redistribution and use in source and binary forms, with or without |    4  * Redistribution and use in source and binary forms, with or without | 
|    5  * modification, are permitted provided that the following conditions |    5  * modification, are permitted provided that the following conditions | 
|    6  * are met: |    6  * are met: | 
|    7  * 1. Redistributions of source code must retain the above copyright |    7  * 1. Redistributions of source code must retain the above copyright | 
|    8  *    notice, this list of conditions and the following disclaimer. |    8  *    notice, this list of conditions and the following disclaimer. | 
|    9  * 2. Redistributions in binary form must reproduce the above copyright |    9  * 2. Redistributions in binary form must reproduce the above copyright | 
|   10  *    notice, this list of conditions and the following disclaimer in the |   10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
|   32 #include "core/editing/EphemeralRange.h" |   32 #include "core/editing/EphemeralRange.h" | 
|   33 #include "core/editing/FindOptions.h" |   33 #include "core/editing/FindOptions.h" | 
|   34 #include "core/editing/FrameSelection.h" |   34 #include "core/editing/FrameSelection.h" | 
|   35 #include "core/editing/VisibleSelection.h" |   35 #include "core/editing/VisibleSelection.h" | 
|   36 #include "core/editing/WritingDirection.h" |   36 #include "core/editing/WritingDirection.h" | 
|   37 #include "core/editing/commands/EditAction.h" |   37 #include "core/editing/commands/EditAction.h" | 
|   38 #include "core/editing/iterators/TextIterator.h" |   38 #include "core/editing/iterators/TextIterator.h" | 
|   39 #include "core/editing/markers/DocumentMarker.h" |   39 #include "core/editing/markers/DocumentMarker.h" | 
|   40 #include "platform/PasteMode.h" |   40 #include "platform/PasteMode.h" | 
|   41 #include "platform/heap/Handle.h" |   41 #include "platform/heap/Handle.h" | 
 |   42 #include <memory> | 
|   42  |   43  | 
|   43 namespace blink { |   44 namespace blink { | 
|   44  |   45  | 
|   45 class CompositeEditCommand; |   46 class CompositeEditCommand; | 
|   46 class DummyPageHolder; |   47 class DummyPageHolder; | 
|   47 class EditCommandComposition; |   48 class EditCommandComposition; | 
|   48 class EditorClient; |   49 class EditorClient; | 
|   49 class EditorInternalCommand; |   50 class EditorInternalCommand; | 
|   50 class LocalFrame; |   51 class LocalFrame; | 
|   51 class HitTestResult; |   52 class HitTestResult; | 
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  248     friend class RevealSelectionScope; |  249     friend class RevealSelectionScope; | 
|  249  |  250  | 
|  250     DECLARE_TRACE(); |  251     DECLARE_TRACE(); | 
|  251  |  252  | 
|  252 private: |  253 private: | 
|  253     Member<LocalFrame> m_frame; |  254     Member<LocalFrame> m_frame; | 
|  254     Member<CompositeEditCommand> m_lastEditCommand; |  255     Member<CompositeEditCommand> m_lastEditCommand; | 
|  255     int m_preventRevealSelection; |  256     int m_preventRevealSelection; | 
|  256     bool m_shouldStartNewKillRingSequence; |  257     bool m_shouldStartNewKillRingSequence; | 
|  257     bool m_shouldStyleWithCSS; |  258     bool m_shouldStyleWithCSS; | 
|  258     const OwnPtr<KillRing> m_killRing; |  259     const std::unique_ptr<KillRing> m_killRing; | 
|  259     VisibleSelection m_mark; |  260     VisibleSelection m_mark; | 
|  260     bool m_areMarkedTextMatchesHighlighted; |  261     bool m_areMarkedTextMatchesHighlighted; | 
|  261     EditorParagraphSeparator m_defaultParagraphSeparator; |  262     EditorParagraphSeparator m_defaultParagraphSeparator; | 
|  262     bool m_overwriteModeEnabled; |  263     bool m_overwriteModeEnabled; | 
|  263  |  264  | 
|  264     explicit Editor(LocalFrame&); |  265     explicit Editor(LocalFrame&); | 
|  265  |  266  | 
|  266     LocalFrame& frame() const |  267     LocalFrame& frame() const | 
|  267     { |  268     { | 
|  268         DCHECK(m_frame); |  269         DCHECK(m_frame); | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  313  |  314  | 
|  314 inline bool Editor::markedTextMatchesAreHighlighted() const |  315 inline bool Editor::markedTextMatchesAreHighlighted() const | 
|  315 { |  316 { | 
|  316     return m_areMarkedTextMatchesHighlighted; |  317     return m_areMarkedTextMatchesHighlighted; | 
|  317 } |  318 } | 
|  318  |  319  | 
|  319  |  320  | 
|  320 } // namespace blink |  321 } // namespace blink | 
|  321  |  322  | 
|  322 #endif // Editor_h |  323 #endif // Editor_h | 
| OLD | NEW |