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

Side by Side Diff: third_party/WebKit/Source/core/editing/SelectionEditor.h

Issue 2680943004: Make FrameSelection to hold non-canonicalized positions (Closed)
Patch Set: 2014-02-14T23:34:22 Update TestExpectation to include extend-{0,2,4}0.html and selectAllChildren.html Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #ifndef SelectionEditor_h 27 #ifndef SelectionEditor_h
28 #define SelectionEditor_h 28 #define SelectionEditor_h
29 29
30 #include "core/dom/SynchronousMutationObserver.h"
30 #include "core/editing/FrameSelection.h" 31 #include "core/editing/FrameSelection.h"
32 #include "core/editing/SelectionTemplate.h"
31 #include "core/events/EventDispatchResult.h" 33 #include "core/events/EventDispatchResult.h"
32 34
33 namespace blink { 35 namespace blink {
34 36
35 // TODO(yosin): We will rename |SelectionEditor| to appropriate name since 37 // TODO(yosin): We will rename |SelectionEditor| to appropriate name since
36 // it is no longer have a changing selection functionality, it was moved to 38 // it is no longer have a changing selection functionality, it was moved to
37 // |SelectionModifier| class. 39 // |SelectionModifier| class.
38 class SelectionEditor final 40 class SelectionEditor final : public GarbageCollectedFinalized<SelectionEditor>,
39 : public GarbageCollectedFinalized<SelectionEditor> { 41 public SynchronousMutationObserver {
40 WTF_MAKE_NONCOPYABLE(SelectionEditor); 42 WTF_MAKE_NONCOPYABLE(SelectionEditor);
43 USING_GARBAGE_COLLECTED_MIXIN(SelectionEditor);
41 44
42 public: 45 public:
43 static SelectionEditor* create(LocalFrame& frame) { 46 static SelectionEditor* create(LocalFrame& frame) {
44 return new SelectionEditor(frame); 47 return new SelectionEditor(frame);
45 } 48 }
46 virtual ~SelectionEditor(); 49 virtual ~SelectionEditor();
47 void dispose(); 50 void dispose();
48 51
49 bool hasEditableStyle() const { return m_selection.hasEditableStyle(); } 52 bool hasEditableStyle() const;
50 bool isContentEditable() const { return m_selection.isContentEditable(); } 53 bool isContentEditable() const;
51 bool isContentRichlyEditable() const { 54 bool isContentRichlyEditable() const;
52 return m_selection.isContentRichlyEditable();
53 }
54
55 bool setSelectedRange(const EphemeralRange&,
56 TextAffinity,
57 SelectionDirectionalMode,
58 FrameSelection::SetSelectionOptions);
59 55
60 template <typename Strategy> 56 template <typename Strategy>
61 const VisibleSelectionTemplate<Strategy>& visibleSelection() const; 57 const VisibleSelectionTemplate<Strategy>& visibleSelection() const;
62 void setVisibleSelection(const VisibleSelection&, 58 const SelectionInDOMTree& selectionInDOMTree() const;
63 FrameSelection::SetSelectionOptions);
64 void setVisibleSelection(const VisibleSelectionInFlatTree&,
65 FrameSelection::SetSelectionOptions);
66 59
67 void setWithoutValidation(const Position& base, const Position& extent); 60 const VisibleSelection& computeVisibleSelectionInDOMTree() const;
61 const VisibleSelectionInFlatTree& computeVisibleSelectionInFlatTree() const;
62 void setSelection(const SelectionInDOMTree&);
68 63
69 void documentAttached(Document*); 64 void documentAttached(Document*);
70 void documentDetached(const Document&);
71 65
72 // If this FrameSelection has a logical range which is still valid, this 66 // If this FrameSelection has a logical range which is still valid, this
73 // function return its clone. Otherwise, the return value from underlying 67 // function return its clone. Otherwise, the return value from underlying
74 // |VisibleSelection|'s |firstRange()| is returned. 68 // |VisibleSelection|'s |firstRange()| is returned.
75 Range* firstRange() const; 69 Range* firstRange() const;
76 70
77 // There functions are exposed for |FrameSelection|. 71 // There functions are exposed for |FrameSelection|.
78 void resetLogicalRange(); 72 void resetLogicalRange();
79 void setLogicalRange(Range*); 73 void setLogicalRange(Range*);
80 74
81 // Updates |m_selection| and |m_selectionInFlatTree| with up-to-date 75 // Updates |m_selection| and |m_selectionInFlatTree| with up-to-date
82 // layout if needed. 76 // layout if needed.
83 void updateIfNeeded(); 77 void updateIfNeeded();
84 78
85 void cacheRangeOfDocument(Range*); 79 void cacheRangeOfDocument(Range*);
86 Range* documentCachedRange() const; 80 Range* documentCachedRange() const;
87 void clearDocumentCachedRange(); 81 void clearDocumentCachedRange();
88 82
89 DECLARE_TRACE(); 83 DECLARE_TRACE();
90 84
91 private: 85 private:
92 explicit SelectionEditor(LocalFrame&); 86 explicit SelectionEditor(LocalFrame&);
93 87
94 const Document& document() const; 88 Document& document() const;
95 LocalFrame* frame() const { return m_frame.get(); } 89 LocalFrame* frame() const { return m_frame.get(); }
96 90
91 void assertSelectionValid() const;
97 void clearVisibleSelection(); 92 void clearVisibleSelection();
93 void markCacheDirty();
98 bool shouldAlwaysUseDirectionalSelection() const; 94 bool shouldAlwaysUseDirectionalSelection() const;
99 95
100 Member<Document> m_document; 96 // VisibleSelection cache related
97 bool needsUpdateVisibleSelection() const;
98 void updateCachedVisibleSelectionIfNeeded() const;
99
100 void didFinishTextChange(const Position& base, const Position& extent);
101 void didFinishDOMMutation();
102
103 // Implementation of |SynchronousMutationObsderver| member functions.
104 void contextDestroyed(Document*) final;
105 void didChangeChildren(const ContainerNode&) final;
106 void didMergeTextNodes(const Text& mergedNode,
107 const NodeWithIndex& nodeToBeRemovedWithIndex,
108 unsigned oldLength) final;
109 void didSplitTextNode(const Text&) final;
110 void didUpdateCharacterData(CharacterData*,
111 unsigned offset,
112 unsigned oldLength,
113 unsigned newLength) final;
114 void nodeChildrenWillBeRemoved(ContainerNode&) final;
115 void nodeWillBeRemoved(Node&) final;
116
101 Member<LocalFrame> m_frame; 117 Member<LocalFrame> m_frame;
102 118
103 VisibleSelection m_selection; 119 SelectionInDOMTree m_selection;
104 VisibleSelectionInFlatTree m_selectionInFlatTree;
105 bool m_observingVisibleSelection;
106 120
107 // TODO(editing-dev): Removing |m_logicalRange| 121 // TODO(editing-dev): Removing |m_logicalRange|
108 // The range specified by the user, which may not be visually canonicalized 122 // The range specified by the user, which may not be visually canonicalized
109 // (hence "logical"). This will be invalidated if the underlying 123 // (hence "logical"). This will be invalidated if the underlying
110 // |VisibleSelection| changes. If that happens, this variable will 124 // |VisibleSelection| changes. If that happens, this variable will
111 // become |nullptr|, in which case logical positions == visible positions. 125 // become |nullptr|, in which case logical positions == visible positions.
112 Member<Range> m_logicalRange; 126 Member<Range> m_logicalRange;
127
113 // If document is root, document.getSelection().addRange(range) is cached on 128 // If document is root, document.getSelection().addRange(range) is cached on
114 // this. 129 // this.
115 Member<Range> m_cachedRange; 130 Member<Range> m_cachedRange;
131
132 mutable VisibleSelection m_cachedVisibleSelectionInDOMTree;
133 mutable VisibleSelectionInFlatTree m_cachedVisibleSelectionInFlatTree;
134 mutable uint64_t m_styleVersion = static_cast<uint64_t>(-1);
135 mutable bool m_cacheIsDirty = false;
116 }; 136 };
117 137
118 } // namespace blink 138 } // namespace blink
119 139
120 #endif // SelectionEditor_h 140 #endif // SelectionEditor_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698