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

Side by Side Diff: third_party/WebKit/Source/core/editing/FrameSelection.cpp

Issue 2803583002: Rename PendingSelection to LayoutSelection (Closed)
Patch Set: Created 3 years, 8 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, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2008, 2009, 2010 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/editing/FrameSelection.h" 26 #include "core/editing/FrameSelection.h"
27 27
28 #include <stdio.h>
28 #include "bindings/core/v8/ExceptionState.h" 29 #include "bindings/core/v8/ExceptionState.h"
29 #include "core/HTMLNames.h" 30 #include "core/HTMLNames.h"
30 #include "core/css/StylePropertySet.h" 31 #include "core/css/StylePropertySet.h"
31 #include "core/dom/AXObjectCache.h" 32 #include "core/dom/AXObjectCache.h"
32 #include "core/dom/CharacterData.h" 33 #include "core/dom/CharacterData.h"
33 #include "core/dom/Document.h" 34 #include "core/dom/Document.h"
34 #include "core/dom/Element.h" 35 #include "core/dom/Element.h"
35 #include "core/dom/ElementTraversal.h" 36 #include "core/dom/ElementTraversal.h"
36 #include "core/dom/NodeTraversal.h" 37 #include "core/dom/NodeTraversal.h"
37 #include "core/dom/NodeWithIndex.h" 38 #include "core/dom/NodeWithIndex.h"
38 #include "core/dom/Text.h" 39 #include "core/dom/Text.h"
39 #include "core/editing/CaretDisplayItemClient.h" 40 #include "core/editing/CaretDisplayItemClient.h"
40 #include "core/editing/EditingUtilities.h" 41 #include "core/editing/EditingUtilities.h"
41 #include "core/editing/Editor.h" 42 #include "core/editing/Editor.h"
42 #include "core/editing/FrameCaret.h" 43 #include "core/editing/FrameCaret.h"
43 #include "core/editing/GranularityStrategy.h" 44 #include "core/editing/GranularityStrategy.h"
44 #include "core/editing/InputMethodController.h" 45 #include "core/editing/InputMethodController.h"
45 #include "core/editing/PendingSelection.h" 46 #include "core/editing/LayoutSelection.h"
46 #include "core/editing/SelectionController.h" 47 #include "core/editing/SelectionController.h"
47 #include "core/editing/SelectionEditor.h" 48 #include "core/editing/SelectionEditor.h"
48 #include "core/editing/SelectionModifier.h" 49 #include "core/editing/SelectionModifier.h"
49 #include "core/editing/TextAffinity.h" 50 #include "core/editing/TextAffinity.h"
50 #include "core/editing/VisibleUnits.h" 51 #include "core/editing/VisibleUnits.h"
51 #include "core/editing/commands/TypingCommand.h" 52 #include "core/editing/commands/TypingCommand.h"
52 #include "core/editing/iterators/TextIterator.h" 53 #include "core/editing/iterators/TextIterator.h"
53 #include "core/editing/serializers/Serialization.h" 54 #include "core/editing/serializers/Serialization.h"
54 #include "core/editing/spellcheck/SpellChecker.h" 55 #include "core/editing/spellcheck/SpellChecker.h"
55 #include "core/events/Event.h" 56 #include "core/events/Event.h"
(...skipping 17 matching lines...) Expand all
73 #include "core/page/FrameTree.h" 74 #include "core/page/FrameTree.h"
74 #include "core/page/Page.h" 75 #include "core/page/Page.h"
75 #include "core/page/SpatialNavigation.h" 76 #include "core/page/SpatialNavigation.h"
76 #include "core/paint/PaintLayer.h" 77 #include "core/paint/PaintLayer.h"
77 #include "platform/SecureTextInput.h" 78 #include "platform/SecureTextInput.h"
78 #include "platform/geometry/FloatQuad.h" 79 #include "platform/geometry/FloatQuad.h"
79 #include "platform/graphics/GraphicsContext.h" 80 #include "platform/graphics/GraphicsContext.h"
80 #include "platform/text/UnicodeUtilities.h" 81 #include "platform/text/UnicodeUtilities.h"
81 #include "wtf/PtrUtil.h" 82 #include "wtf/PtrUtil.h"
82 #include "wtf/text/CString.h" 83 #include "wtf/text/CString.h"
83 #include <stdio.h>
84 84
85 #define EDIT_DEBUG 0 85 #define EDIT_DEBUG 0
86 86
87 namespace blink { 87 namespace blink {
88 88
89 using namespace HTMLNames; 89 using namespace HTMLNames;
90 90
91 static inline bool shouldAlwaysUseDirectionalSelection(LocalFrame* frame) { 91 static inline bool shouldAlwaysUseDirectionalSelection(LocalFrame* frame) {
92 return frame->editor().behavior().shouldConsiderSelectionAsDirectional(); 92 return frame->editor().behavior().shouldConsiderSelectionAsDirectional();
93 } 93 }
94 94
95 FrameSelection::FrameSelection(LocalFrame& frame) 95 FrameSelection::FrameSelection(LocalFrame& frame)
96 : m_frame(frame), 96 : m_frame(frame),
97 m_pendingSelection(PendingSelection::create(*this)), 97 m_pendingSelection(LayoutSelection::create(*this)),
98 m_selectionEditor(SelectionEditor::create(frame)), 98 m_selectionEditor(SelectionEditor::create(frame)),
99 m_granularity(CharacterGranularity), 99 m_granularity(CharacterGranularity),
100 m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()), 100 m_xPosForVerticalArrowNavigation(NoXPosForVerticalArrowNavigation()),
101 m_focused(frame.page() && 101 m_focused(frame.page() &&
102 frame.page()->focusController().focusedFrame() == frame), 102 frame.page()->focusController().focusedFrame() == frame),
103 m_frameCaret(new FrameCaret(frame, *m_selectionEditor)) {} 103 m_frameCaret(new FrameCaret(frame, *m_selectionEditor)) {}
104 104
105 FrameSelection::~FrameSelection() {} 105 FrameSelection::~FrameSelection() {}
106 106
107 const DisplayItemClient& FrameSelection::caretDisplayItemClientForTesting() 107 const DisplayItemClient& FrameSelection::caretDisplayItemClientForTesting()
(...skipping 1036 matching lines...) Expand 10 before | Expand all | Expand 10 after
1144 } 1144 }
1145 1145
1146 void showTree(const blink::FrameSelection* sel) { 1146 void showTree(const blink::FrameSelection* sel) {
1147 if (sel) 1147 if (sel)
1148 sel->showTreeForThis(); 1148 sel->showTreeForThis();
1149 else 1149 else
1150 LOG(INFO) << "Cannot showTree for <null> FrameSelection."; 1150 LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
1151 } 1151 }
1152 1152
1153 #endif 1153 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698