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

Side by Side Diff: Source/core/layout/LayoutView.cpp

Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-22T04:51:20 Rebase Created 5 years, 4 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/layout/LayoutObject.cpp ('k') | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 if (!selection.isRange()) { 796 if (!selection.isRange()) {
797 clearSelection(); 797 clearSelection();
798 return; 798 return;
799 } 799 }
800 800
801 // Use the rightmost candidate for the start of the selection, and the leftm ost candidate for the end of the selection. 801 // Use the rightmost candidate for the start of the selection, and the leftm ost candidate for the end of the selection.
802 // Example: foo <a>bar</a>. Imagine that a line wrap occurs after 'foo', an d that 'bar' is selected. If we pass [foo, 3] 802 // Example: foo <a>bar</a>. Imagine that a line wrap occurs after 'foo', an d that 'bar' is selected. If we pass [foo, 3]
803 // as the start of the selection, the selection painting code will think tha t content on the line containing 'foo' is selected 803 // as the start of the selection, the selection painting code will think tha t content on the line containing 'foo' is selected
804 // and will fill the gap before 'bar'. 804 // and will fill the gap before 'bar'.
805 PositionType startPos = Strategy::selectionStart(selection); 805 PositionType startPos = Strategy::selectionStart(selection);
806 PositionType candidate = startPos.downstream(); 806 PositionType candidate = mostForwardCaretPosition(startPos);
807 if (isVisuallyEquivalentCandidate(candidate)) 807 if (isVisuallyEquivalentCandidate(candidate))
808 startPos = candidate; 808 startPos = candidate;
809 PositionType endPos = Strategy::selectionEnd(selection); 809 PositionType endPos = Strategy::selectionEnd(selection);
810 candidate = endPos.upstream(); 810 candidate = mostBackwardCaretPosition(endPos);
811 if (isVisuallyEquivalentCandidate(candidate)) 811 if (isVisuallyEquivalentCandidate(candidate))
812 endPos = candidate; 812 endPos = candidate;
813 813
814 // We can get into a state where the selection endpoints map to the same Vis iblePosition when a selection is deleted 814 // We can get into a state where the selection endpoints map to the same Vis iblePosition when a selection is deleted
815 // because we don't yet notify the FrameSelection of text removal. 815 // because we don't yet notify the FrameSelection of text removal.
816 if (startPos.isNull() || endPos.isNull() || Strategy::selectionVisibleStart( selection).deepEquivalent() == Strategy::selectionVisibleEnd(selection).deepEqui valent()) 816 if (startPos.isNull() || endPos.isNull() || Strategy::selectionVisibleStart( selection).deepEquivalent() == Strategy::selectionVisibleEnd(selection).deepEqui valent())
817 return; 817 return;
818 LayoutObject* startLayoutObject = startPos.anchorNode()->layoutObject(); 818 LayoutObject* startLayoutObject = startPos.anchorNode()->layoutObject();
819 LayoutObject* endLayoutObject = endPos.anchorNode()->layoutObject(); 819 LayoutObject* endLayoutObject = endPos.anchorNode()->layoutObject();
820 if (!startLayoutObject || !endLayoutObject) 820 if (!startLayoutObject || !endLayoutObject)
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 return viewHeight(IncludeScrollbars) / scale; 1006 return viewHeight(IncludeScrollbars) / scale;
1007 } 1007 }
1008 1008
1009 void LayoutView::willBeDestroyed() 1009 void LayoutView::willBeDestroyed()
1010 { 1010 {
1011 LayoutBlockFlow::willBeDestroyed(); 1011 LayoutBlockFlow::willBeDestroyed();
1012 m_compositor.clear(); 1012 m_compositor.clear();
1013 } 1013 }
1014 1014
1015 } // namespace blink 1015 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutObject.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698