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

Side by Side Diff: Source/core/editing/Editor.cpp

Issue 1317053004: Make VisiblePosition constructor private (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-02T12:44:47 Rebase Created 5 years, 3 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
« no previous file with comments | « Source/core/editing/EditingUtilities.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
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
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 { 248 {
249 Node* startContainer = range.startPosition().computeContainerNode(); 249 Node* startContainer = range.startPosition().computeContainerNode();
250 Node* endContainer = range.endPosition().computeContainerNode(); 250 Node* endContainer = range.endPosition().computeContainerNode();
251 if (!startContainer || !endContainer) 251 if (!startContainer || !endContainer)
252 return false; 252 return false;
253 253
254 if (!startContainer->hasEditableStyle() || !endContainer->hasEditableStyle() ) 254 if (!startContainer->hasEditableStyle() || !endContainer->hasEditableStyle() )
255 return false; 255 return false;
256 256
257 if (range.isCollapsed()) { 257 if (range.isCollapsed()) {
258 VisiblePosition start(range.startPosition()); 258 VisiblePosition start = createVisiblePosition(range.startPosition());
259 VisiblePosition previous = previousPositionOf(start); 259 VisiblePosition previous = previousPositionOf(start);
260 // FIXME: We sometimes allow deletions at the start of editable roots, l ike when the caret is in an empty list item. 260 // FIXME: We sometimes allow deletions at the start of editable roots, l ike when the caret is in an empty list item.
261 if (previous.isNull() || previous.deepEquivalent().anchorNode()->rootEdi tableElement() != startContainer->rootEditableElement()) 261 if (previous.isNull() || previous.deepEquivalent().anchorNode()->rootEdi tableElement() != startContainer->rootEditableElement())
262 return false; 262 return false;
263 } 263 }
264 return true; 264 return true;
265 } 265 }
266 266
267 bool Editor::smartInsertDeleteEnabled() const 267 bool Editor::smartInsertDeleteEnabled() const
268 { 268 {
(...skipping 809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 // starts a new kill ring sequence, but we want to do these things (matches AppKit). 1078 // starts a new kill ring sequence, but we want to do these things (matches AppKit).
1079 if (selectionDidNotChangeDOMPosition) 1079 if (selectionDidNotChangeDOMPosition)
1080 client().respondToChangedSelection(m_frame, frame().selection().selectio nType()); 1080 client().respondToChangedSelection(m_frame, frame().selection().selectio nType());
1081 } 1081 }
1082 1082
1083 IntRect Editor::firstRectForRange(const EphemeralRange& range) const 1083 IntRect Editor::firstRectForRange(const EphemeralRange& range) const
1084 { 1084 {
1085 LayoutUnit extraWidthToEndOfLine = 0; 1085 LayoutUnit extraWidthToEndOfLine = 0;
1086 ASSERT(range.isNotNull()); 1086 ASSERT(range.isNotNull());
1087 1087
1088 IntRect startCaretRect = RenderedPosition(VisiblePosition(range.startPositio n()).deepEquivalent(), TextAffinity::Downstream).absoluteRect(&extraWidthToEndOf Line); 1088 IntRect startCaretRect = RenderedPosition(createVisiblePosition(range.startP osition()).deepEquivalent(), TextAffinity::Downstream).absoluteRect(&extraWidthT oEndOfLine);
1089 if (startCaretRect.isEmpty()) 1089 if (startCaretRect.isEmpty())
1090 return IntRect(); 1090 return IntRect();
1091 1091
1092 IntRect endCaretRect = RenderedPosition(VisiblePosition(range.endPosition()) .deepEquivalent(), TextAffinity::Upstream).absoluteRect(); 1092 IntRect endCaretRect = RenderedPosition(createVisiblePosition(range.endPosit ion()).deepEquivalent(), TextAffinity::Upstream).absoluteRect();
1093 if (endCaretRect.isEmpty()) 1093 if (endCaretRect.isEmpty())
1094 return IntRect(); 1094 return IntRect();
1095 1095
1096 if (startCaretRect.y() == endCaretRect.y()) { 1096 if (startCaretRect.y() == endCaretRect.y()) {
1097 // start and end are on the same line 1097 // start and end are on the same line
1098 return IntRect(std::min(startCaretRect.x(), endCaretRect.x()), 1098 return IntRect(std::min(startCaretRect.x(), endCaretRect.x()),
1099 startCaretRect.y(), 1099 startCaretRect.y(),
1100 abs(endCaretRect.x() - startCaretRect.x()), 1100 abs(endCaretRect.x() - startCaretRect.x()),
1101 std::max(startCaretRect.height(), endCaretRect.height())); 1101 std::max(startCaretRect.height(), endCaretRect.height()));
1102 } 1102 }
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 } 1301 }
1302 1302
1303 DEFINE_TRACE(Editor) 1303 DEFINE_TRACE(Editor)
1304 { 1304 {
1305 visitor->trace(m_frame); 1305 visitor->trace(m_frame);
1306 visitor->trace(m_lastEditCommand); 1306 visitor->trace(m_lastEditCommand);
1307 visitor->trace(m_mark); 1307 visitor->trace(m_mark);
1308 } 1308 }
1309 1309
1310 } // namespace blink 1310 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/EditingUtilities.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698