OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "core/html/HTMLTextFormControlElement.h" | 6 #include "core/html/HTMLTextFormControlElement.h" |
7 | 7 |
8 #include "core/dom/Text.h" | 8 #include "core/dom/Text.h" |
9 #include "core/editing/FrameSelection.h" | 9 #include "core/editing/FrameSelection.h" |
10 #include "core/editing/Position.h" | 10 #include "core/editing/Position.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 EXPECT_EQ(startLayoutCount, layoutCount()); | 129 EXPECT_EQ(startLayoutCount, layoutCount()); |
130 newCaretRect = LayoutRect(frameSelection.absoluteCaretBounds()); | 130 newCaretRect = LayoutRect(frameSelection.absoluteCaretBounds()); |
131 EXPECT_NE(oldCaretRect, newCaretRect); | 131 EXPECT_NE(oldCaretRect, newCaretRect); |
132 } | 132 } |
133 | 133 |
134 typedef Position (*PositionFunction)(const Position&); | 134 typedef Position (*PositionFunction)(const Position&); |
135 typedef VisiblePosition(*VisblePositionFunction)(const VisiblePosition&); | 135 typedef VisiblePosition(*VisblePositionFunction)(const VisiblePosition&); |
136 | 136 |
137 void testFunctionEquivalence(const Position& position, PositionFunction position
Function, VisblePositionFunction visibleFunction) | 137 void testFunctionEquivalence(const Position& position, PositionFunction position
Function, VisblePositionFunction visibleFunction) |
138 { | 138 { |
139 VisiblePosition visiblePosition(position); | 139 VisiblePosition visiblePosition = createVisiblePosition(position); |
140 VisiblePosition expected = visibleFunction(visiblePosition); | 140 VisiblePosition expected = visibleFunction(visiblePosition); |
141 VisiblePosition actual = VisiblePosition(positionFunction(position)); | 141 VisiblePosition actual = createVisiblePosition(positionFunction(position)); |
142 EXPECT_EQ(expected.deepEquivalent(), actual.deepEquivalent()); | 142 EXPECT_EQ(expected.deepEquivalent(), actual.deepEquivalent()); |
143 } | 143 } |
144 | 144 |
145 static VisiblePosition startOfWord(const VisiblePosition& position) | 145 static VisiblePosition startOfWord(const VisiblePosition& position) |
146 { | 146 { |
147 return startOfWord(position, LeftWordIfOnBoundary); | 147 return startOfWord(position, LeftWordIfOnBoundary); |
148 } | 148 } |
149 | 149 |
150 static VisiblePosition endOfWord(const VisiblePosition& position) | 150 static VisiblePosition endOfWord(const VisiblePosition& position) |
151 { | 151 { |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 ASSERT_EQ(3, input->selectionStart()); | 217 ASSERT_EQ(3, input->selectionStart()); |
218 | 218 |
219 OwnPtrWillBePersistent<SpellChecker> spellChecker(SpellChecker::create(page(
).frame())); | 219 OwnPtrWillBePersistent<SpellChecker> spellChecker(SpellChecker::create(page(
).frame())); |
220 forceLayoutFlag(); | 220 forceLayoutFlag(); |
221 int startCount = layoutCount(); | 221 int startCount = layoutCount(); |
222 spellChecker->respondToChangedSelection(oldSelection, FrameSelection::CloseT
yping | FrameSelection::ClearTypingStyle); | 222 spellChecker->respondToChangedSelection(oldSelection, FrameSelection::CloseT
yping | FrameSelection::ClearTypingStyle); |
223 EXPECT_EQ(startCount, layoutCount()); | 223 EXPECT_EQ(startCount, layoutCount()); |
224 } | 224 } |
225 | 225 |
226 } // namespace blink | 226 } // namespace blink |
OLD | NEW |