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

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

Issue 1202153004: Enable selection for the composed tree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename the flag Created 5 years, 6 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/editing/VisibleSelection.cpp ('k') | Source/core/layout/PendingSelection.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) 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 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 LayoutObject* startLayoutObject = startPos.anchorNode()->layoutObject(); 797 LayoutObject* startLayoutObject = startPos.anchorNode()->layoutObject();
798 LayoutObject* endLayoutObject = endPos.anchorNode()->layoutObject(); 798 LayoutObject* endLayoutObject = endPos.anchorNode()->layoutObject();
799 if (!startLayoutObject || !endLayoutObject) 799 if (!startLayoutObject || !endLayoutObject)
800 return; 800 return;
801 ASSERT(startLayoutObject->view() == this && endLayoutObject->view() == this) ; 801 ASSERT(startLayoutObject->view() == this && endLayoutObject->view() == this) ;
802 setSelection(startLayoutObject, startPos.deprecatedEditingOffset(), endLayou tObject, endPos.deprecatedEditingOffset()); 802 setSelection(startLayoutObject, startPos.deprecatedEditingOffset(), endLayou tObject, endPos.deprecatedEditingOffset());
803 } 803 }
804 804
805 void LayoutView::commitPendingSelection() 805 void LayoutView::commitPendingSelection()
806 { 806 {
807 if (RuntimeEnabledFeatures::selectionForComposedTreeEnabled())
808 return commitPendingSelectionAlgorithm<VisibleSelection::InComposedTree> ();
807 commitPendingSelectionAlgorithm<VisibleSelection::InDOMTree>(); 809 commitPendingSelectionAlgorithm<VisibleSelection::InDOMTree>();
808 } 810 }
809 811
810 LayoutObject* LayoutView::selectionStart() 812 LayoutObject* LayoutView::selectionStart()
811 { 813 {
812 commitPendingSelection(); 814 commitPendingSelection();
813 return m_selectionStart; 815 return m_selectionStart;
814 } 816 }
815 817
816 LayoutObject* LayoutView::selectionEnd() 818 LayoutObject* LayoutView::selectionEnd()
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 return viewHeight(IncludeScrollbars) / scale; 972 return viewHeight(IncludeScrollbars) / scale;
971 } 973 }
972 974
973 void LayoutView::willBeDestroyed() 975 void LayoutView::willBeDestroyed()
974 { 976 {
975 LayoutBlockFlow::willBeDestroyed(); 977 LayoutBlockFlow::willBeDestroyed();
976 m_compositor.clear(); 978 m_compositor.clear();
977 } 979 }
978 980
979 } // namespace blink 981 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/editing/VisibleSelection.cpp ('k') | Source/core/layout/PendingSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698