commit ebb179b6167fc95ce8c47b0277fbe1818d449d4d
author jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jul 16 17:54:41 2014
committer jdduke@chromium.org <jdduke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jul 16 17:54:41 2014
tree c1cbb8ac34c1819a265355fa412b6b07611cdfd4
parent 219643ffa4b91d8bcf5e50d575b656b9431d4feb

Rename composited selection anchor/focus to start/end

Maintain naming consistency with Blink wherein selection start and end indicate
proper and consistent ordering in the document.

BUG=279489

Review URL: https://codereview.chromium.org/379473002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283421 0039d316-1c4b-4281-b951-d872f2087c98

cc/trees/layer_tree_impl.cc

diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index bf0a996..392e80b 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -211,7 +211,7 @@
     target_tree->ClearViewportLayers();
   }
 
-  target_tree->RegisterSelection(selection_anchor_, selection_focus_);
+  target_tree->RegisterSelection(selection_start_, selection_end_);
 
   // This should match the property synchronization in
   // LayerTreeHost::finishCommitOnImplThread().
@@ -1315,10 +1315,10 @@
   return data_for_recursion.closest_match;
 }
 
-void LayerTreeImpl::RegisterSelection(const LayerSelectionBound& anchor,
-                                      const LayerSelectionBound& focus) {
-  selection_anchor_ = anchor;
-  selection_focus_ = focus;
+void LayerTreeImpl::RegisterSelection(const LayerSelectionBound& start,
+                                      const LayerSelectionBound& end) {
+  selection_start_ = start;
+  selection_end_ = end;
 }
 
 static ViewportSelectionBound ComputeViewportSelection(
@@ -1349,22 +1349,22 @@
   return result;
 }
 
-void LayerTreeImpl::GetViewportSelection(ViewportSelectionBound* anchor,
-                                         ViewportSelectionBound* focus) {
-  DCHECK(anchor);
-  DCHECK(focus);
+void LayerTreeImpl::GetViewportSelection(ViewportSelectionBound* start,
+                                         ViewportSelectionBound* end) {
+  DCHECK(start);
+  DCHECK(end);
 
-  *anchor = ComputeViewportSelection(
-      selection_anchor_,
-      selection_anchor_.layer_id ? LayerById(selection_anchor_.layer_id) : NULL,
+  *start = ComputeViewportSelection(
+      selection_start_,
+      selection_start_.layer_id ? LayerById(selection_start_.layer_id) : NULL,
       device_scale_factor());
-  if (anchor->type == SELECTION_BOUND_CENTER ||
-      anchor->type == SELECTION_BOUND_EMPTY) {
-    *focus = *anchor;
+  if (start->type == SELECTION_BOUND_CENTER ||
+      start->type == SELECTION_BOUND_EMPTY) {
+    *end = *start;
   } else {
-    *focus = ComputeViewportSelection(
-        selection_focus_,
-        selection_focus_.layer_id ? LayerById(selection_focus_.layer_id) : NULL,
+    *end = ComputeViewportSelection(
+        selection_end_,
+        selection_end_.layer_id ? LayerById(selection_end_.layer_id) : NULL,
         device_scale_factor());
   }
 }