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

Side by Side Diff: Source/core/dom/PositionIterator.cpp

Issue 182383012: Have positionInParentBeforeNode() / positionInParentAfterNode() take a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/editing/ApplyStyleCommand.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) 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 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 23 matching lines...) Expand all
34 34
35 using namespace HTMLNames; 35 using namespace HTMLNames;
36 36
37 PositionIterator::operator Position() const 37 PositionIterator::operator Position() const
38 { 38 {
39 if (m_nodeAfterPositionInAnchor) { 39 if (m_nodeAfterPositionInAnchor) {
40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode); 40 ASSERT(m_nodeAfterPositionInAnchor->parentNode() == m_anchorNode);
41 // FIXME: This check is inadaquete because any ancestor could be ignored by editing 41 // FIXME: This check is inadaquete because any ancestor could be ignored by editing
42 if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode())) 42 if (editingIgnoresContent(m_nodeAfterPositionInAnchor->parentNode()))
43 return positionBeforeNode(m_anchorNode); 43 return positionBeforeNode(m_anchorNode);
44 return positionInParentBeforeNode(m_nodeAfterPositionInAnchor); 44 return positionInParentBeforeNode(*m_nodeAfterPositionInAnchor);
45 } 45 }
46 if (m_anchorNode->hasChildren()) 46 if (m_anchorNode->hasChildren())
47 return lastPositionInOrAfterNode(m_anchorNode); 47 return lastPositionInOrAfterNode(m_anchorNode);
48 return createLegacyEditingPosition(m_anchorNode, m_offsetInAnchor); 48 return createLegacyEditingPosition(m_anchorNode, m_offsetInAnchor);
49 } 49 }
50 50
51 void PositionIterator::increment() 51 void PositionIterator::increment()
52 { 52 {
53 if (!m_anchorNode) 53 if (!m_anchorNode)
54 return; 54 return;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer )) 163 if (!Position::hasRenderedNonAnonymousDescendantsWithHeight(renderer ))
164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch orNode); 164 return atStartOfNode() && !Position::nodeIsUserSelectNone(m_anch orNode);
165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe lectNone(m_anchorNode) && Position(*this).atEditingBoundary(); 165 return m_anchorNode->rendererIsEditable() && !Position::nodeIsUserSe lectNone(m_anchorNode) && Position(*this).atEditingBoundary();
166 } 166 }
167 } 167 }
168 168
169 return false; 169 return false;
170 } 170 }
171 171
172 } // namespace WebCore 172 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Position.cpp ('k') | Source/core/editing/ApplyStyleCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698