Change SelectionModifier::ModifyMovingRight() not to use redundant local variable

third_party/WebKit/Source/core/editing/SelectionModifier.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 246 matching lines @@
         pos = EndOfDocument(pos);
       break;
   }
   AdjustPositionForUserSelectAll(
       pos, DirectionOfEnclosingBlock() == TextDirection::kLtr);
   return pos;
 }
 
 VisiblePosition SelectionModifier::ModifyMovingRight(
     TextGranularity granularity) {
-  VisiblePosition pos;
   switch (granularity) {
     case kCharacterGranularity:
-      if (selection_.IsRange()) {
-        if (DirectionOfSelection() == TextDirection::kLtr)
-          pos = CreateVisiblePosition(selection_.end(), selection_.Affinity());
-        else
-          pos =
-              CreateVisiblePosition(selection_.Start(), selection_.Affinity());
-      } else {
-        pos = RightPositionOf(
+      if (!selection_.IsRange()) {
+        return RightPositionOf(
             CreateVisiblePosition(selection_.Extent(), selection_.Affinity()));
       }
-      break;
+      if (DirectionOfSelection() == TextDirection::kLtr)
+        return CreateVisiblePosition(selection_.end(), selection_.Affinity());
+      return CreateVisiblePosition(selection_.Start(), selection_.Affinity());
     case kWordGranularity: {
-      bool skips_space_when_moving_right =
+      const bool skips_space_when_moving_right =
           GetFrame() &&
           GetFrame()->GetEditor().Behavior().ShouldSkipSpaceWhenMovingRight();
-      pos = RightWordPosition(
+      return RightWordPosition(
           CreateVisiblePosition(selection_.Extent(), selection_.Affinity()),
           skips_space_when_moving_right);
-      break;
     }
     case kSentenceGranularity:
     case kLineGranularity:
     case kParagraphGranularity:
     case kSentenceBoundary:
     case kParagraphBoundary:
     case kDocumentBoundary:
-      // FIXME: Implement all of the above.
-      pos = ModifyMovingForward(granularity);
-      break;
+      // TODO(editing-dev): Implement all of the above.
+      return ModifyMovingForward(granularity);
     case kLineBoundary:
-      pos =
-          RightBoundaryOfLine(StartForPlatform(), DirectionOfEnclosingBlock());
-      break;
+      return RightBoundaryOfLine(StartForPlatform(),
+                                 DirectionOfEnclosingBlock());
   }
-  return pos;
+  NOTREACHED() << granularity;
+  return VisiblePosition();
 }
 
 VisiblePosition SelectionModifier::ModifyMovingForward(
     TextGranularity granularity) {
   VisiblePosition pos;
   // FIXME: Stay in editable content for the less common granularities.
   switch (granularity) {
     case kCharacterGranularity:
       if (selection_.IsRange())
         pos = CreateVisiblePosition(selection_.end(), selection_.Affinity());
@@ skipping 535 matching lines @@
     x = LineDirectionPointForBlockDirectionNavigationOf(visible_position);
     x_pos_for_vertical_arrow_navigation_ = x;
   } else {
     x = x_pos_for_vertical_arrow_navigation_;
   }
 
   return x;
 }
 
 }  // namespace blink