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

Unified Diff: third_party/WebKit/Source/core/editing/SelectionModifier.cpp

Issue 2904813006: Change SelectionModifier::ModifyMovingLeft() not to use redundant local variable (Closed)
Patch Set: 2017-05-26T19:15:29 Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/editing/SelectionModifier.cpp
diff --git a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
index 935a3e8e2eb9dac531729f24c010f7b510d179e2..2f5e3c9fe278654cad4282c26570594f28483c5f 100644
--- a/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
+++ b/third_party/WebKit/Source/core/editing/SelectionModifier.cpp
@@ -455,28 +455,22 @@ VisiblePosition SelectionModifier::ModifyExtendingBackward(
VisiblePosition SelectionModifier::ModifyMovingLeft(
TextGranularity granularity) {
- VisiblePosition pos;
switch (granularity) {
case kCharacterGranularity:
- if (selection_.IsRange()) {
- if (DirectionOfSelection() == TextDirection::kLtr)
- pos =
- CreateVisiblePosition(selection_.Start(), selection_.Affinity());
- else
- pos = CreateVisiblePosition(selection_.end(), selection_.Affinity());
- } else {
- pos = LeftPositionOf(
+ if (!selection_.IsRange()) {
+ return LeftPositionOf(
CreateVisiblePosition(selection_.Extent(), selection_.Affinity()));
}
- break;
+ if (DirectionOfSelection() == TextDirection::kLtr)
+ return CreateVisiblePosition(selection_.Start(), selection_.Affinity());
+ return CreateVisiblePosition(selection_.end(), selection_.Affinity());
case kWordGranularity: {
- bool skips_space_when_moving_right =
+ const bool skips_space_when_moving_right =
GetFrame() &&
GetFrame()->GetEditor().Behavior().ShouldSkipSpaceWhenMovingRight();
- pos = LeftWordPosition(
+ return LeftWordPosition(
CreateVisiblePosition(selection_.Extent(), selection_.Affinity()),
skips_space_when_moving_right);
- break;
}
case kSentenceGranularity:
case kLineGranularity:
@@ -485,13 +479,13 @@ VisiblePosition SelectionModifier::ModifyMovingLeft(
case kParagraphBoundary:
case kDocumentBoundary:
// FIXME: Implement all of the above.
- pos = ModifyMovingBackward(granularity);
- break;
+ return ModifyMovingBackward(granularity);
case kLineBoundary:
- pos = LeftBoundaryOfLine(StartForPlatform(), DirectionOfEnclosingBlock());
- break;
+ return LeftBoundaryOfLine(StartForPlatform(),
+ DirectionOfEnclosingBlock());
}
- return pos;
+ NOTREACHED() << granularity;
+ return VisiblePosition();
}
VisiblePosition SelectionModifier::ModifyMovingBackward(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698