Apply early retrun in SelectionController

Source/core/editing/SelectionController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  * Copyright (C) 2015 Google 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
@@ skipping 48 matching lines @@
 {
 }
 
 DEFINE_TRACE(SelectionController)
 {
     visitor->trace(m_frame);
 }
 
 static void setSelectionIfNeeded(FrameSelection& selection, const VisibleSelection& newSelection)
 {
-    if (!VisibleSelection::InDOMTree::equalSelections(selection.selection(), newSelection))
-        selection.setSelection(newSelection);
+    if (VisibleSelection::InDOMTree::equalSelections(selection.selection(), newSelection))
+        return;
+    selection.setSelection(newSelection);
 }
 
 static inline bool dispatchSelectStart(Node* node)
 {
     if (!node || !node->layoutObject())
         return true;
 
     return node->dispatchEvent(Event::createCancelableBubble(EventTypeNames::selectstart));
 }
 
@@ skipping 45 matching lines @@
     this->selection().setNonDirectionalSelectionIfNeeded(selection, granularity);
 
     return true;
 }
 
 void SelectionController::selectClosestWordFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
 {
     Node* innerNode = result.innerNode();
     VisibleSelection newSelection;
 
-    if (innerNode && innerNode->layoutObject()) {
-        VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
-        if (pos.isNotNull()) {
-            newSelection = VisibleSelection(pos);
-            expandSelectionUsingGranularity(newSelection, WordGranularity);
-        }
+    if (!innerNode || !innerNode->layoutObject())
+        return;
 
-        if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
-            newSelection.appendTrailingWhitespace();
+    VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
+    if (pos.isNotNull()) {
+        newSelection = VisibleSelection(pos);
+        expandSelectionUsingGranularity(newSelection, WordGranularity);
+    }
 
-        updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
-    }
+    if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
+        newSelection.appendTrailingWhitespace();
+
+    updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestMisspellingFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
 {
     Node* innerNode = result.innerNode();
     VisibleSelection newSelection;
 
-    if (innerNode && innerNode->layoutObject()) {
-        VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
-        Position start = pos.deepEquivalent();
-        Position end = pos.deepEquivalent();
-        if (pos.isNotNull()) {
-            DocumentMarkerVector markers = innerNode->document().markers().markersInRange(makeRange(pos, pos).get(), DocumentMarker::MisspellingMarkers());
-            if (markers.size() == 1) {
-                start.moveToOffset(markers[0]->startOffset());
-                end.moveToOffset(markers[0]->endOffset());
-                newSelection = VisibleSelection(start, end);
-            }
+    if (!innerNode || !innerNode->layoutObject())
+        return;
+
+    VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
+    Position start = pos.deepEquivalent();
+    Position end = pos.deepEquivalent();
+    if (pos.isNotNull()) {
+        DocumentMarkerVector markers = innerNode->document().markers().markersInRange(makeRange(pos, pos).get(), DocumentMarker::MisspellingMarkers());
+        if (markers.size() == 1) {
+            start.moveToOffset(markers[0]->startOffset());
+            end.moveToOffset(markers[0]->endOffset());
+            newSelection = VisibleSelection(start, end);
         }
+    }
 
-        if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
-            newSelection.appendTrailingWhitespace();
+    if (appendTrailingWhitespace == AppendTrailingWhitespace::ShouldAppend && newSelection.isRange())
+        newSelection.appendTrailingWhitespace();
 
-        updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
-    }
+    updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 void SelectionController::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults& result)
 {
-    if (m_mouseDownMayStartSelect) {
-        selectClosestWordFromHitTestResult(result.hitTestResult(),
-            (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend);
-    }
+    if (!m_mouseDownMayStartSelect)
+        return;
+
+    selectClosestWordFromHitTestResult(result.hitTestResult(),
+        (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend);
 }
 
 void SelectionController::selectClosestMisspellingFromMouseEvent(const MouseEventWithHitTestResults& result)
 {
-    if (m_mouseDownMayStartSelect) {
-        selectClosestMisspellingFromHitTestResult(result.hitTestResult(),
-            (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend);
-    }
+    if (!m_mouseDownMayStartSelect)
+        return;
+
+    selectClosestMisspellingFromHitTestResult(result.hitTestResult(),
+        (result.event().clickCount() == 2 && m_frame->editor().isSelectTrailingWhitespaceEnabled()) ? AppendTrailingWhitespace::ShouldAppend : AppendTrailingWhitespace::DontAppend);
+
 }
 
 void SelectionController::selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults& result)
 {
     if (!result.hitTestResult().isLiveLink())
         return selectClosestWordFromMouseEvent(result);
 
     Node* innerNode = result.innerNode();
 
-    if (innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect) {
-        VisibleSelection newSelection;
-        Element* URLElement = result.hitTestResult().URLElement();
-        VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
-        if (pos.isNotNull() && pos.deepEquivalent().deprecatedNode()->isDescendantOf(URLElement))
-            newSelection = VisibleSelection::selectionFromContentsOfNode(URLElement);
+    if (!(innerNode && innerNode->layoutObject() && m_mouseDownMayStartSelect))

[yosin_UTC9, 2015/06/26 01:00:28]

nit: Since other parts expand Boolean expression, let's expand this too.

[Miyoung Shin(c), 2015/06/26 04:44:20]

Done.

+        return;
 
-        updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
-    }
+    VisibleSelection newSelection;
+    Element* URLElement = result.hitTestResult().URLElement();
+    VisiblePosition pos(innerNode->layoutObject()->positionForPoint(result.localPoint()));
+    if (pos.isNotNull() && pos.deepEquivalent().deprecatedNode()->isDescendantOf(URLElement))
+        newSelection = VisibleSelection::selectionFromContentsOfNode(URLElement);
+
+    updateSelectionForMouseDownDispatchingSelectStart(innerNode, expandSelectionToRespectUserSelectAll(innerNode, newSelection), WordGranularity);
 }
 
 bool SelectionController::handleMousePressEventDoubleClick(const MouseEventWithHitTestResults& event)
 {
     TRACE_EVENT0("blink", "SelectionController::handleMousePressEventDoubleClick");
 
     if (event.event().button() != LeftButton)
         return false;
 
     if (selection().isRange()) {
@@ skipping 312 matching lines @@
     return false;
 }
 
 bool SelectionController::handleGestureLongPress(const PlatformGestureEvent& gestureEvent, const HitTestResult& hitTestResult)
 {
 #if OS(ANDROID)
     bool shouldLongPressSelectWord = true;
 #else
     bool shouldLongPressSelectWord = m_frame->settings() && m_frame->settings()->touchEditingEnabled();
 #endif
-    if (shouldLongPressSelectWord) {
+    if (!shouldLongPressSelectWord)
+        return false;
 
+    Node* innerNode = hitTestResult.innerNode();
+    if (hitTestResult.isLiveLink() || !innerNode || !(innerNode->isContentEditable() || innerNode->isTextNode()
+#if OS(ANDROID)
+        || innerNode->canStartSelection()
+#endif
+        ))
+        return false;
 
-        Node* innerNode = hitTestResult.innerNode();
-        if (!hitTestResult.isLiveLink() && innerNode && (innerNode->isContentEditable() || innerNode->isTextNode()
-#if OS(ANDROID)
-            || innerNode->canStartSelection()
-#endif
-            )) {
-            selectClosestWordFromHitTestResult(hitTestResult, AppendTrailingWhitespace::DontAppend);
-            if (selection().isRange())
-                return true;
-        }
-    }
-    return false;
+    selectClosestWordFromHitTestResult(hitTestResult, AppendTrailingWhitespace::DontAppend);
+    if (!selection().isRange())
+        return false;
+    return true;
 }
 
 void SelectionController::sendContextMenuEvent(const MouseEventWithHitTestResults& mev, const LayoutPoint& position)
 {
-    if (!selection().contains(position)
-        && !mev.scrollbar()
+    if (selection().contains(position)
+        || mev.scrollbar()
         // FIXME: In the editable case, word selection sometimes selects content that isn't underneath the mouse.
         // If the selection is non-editable, we do word selection to make it easier to use the contextual menu items
         // available for text selections.  But only if we're above text.
-        && (selection().isContentEditable() || (mev.innerNode() && mev.innerNode()->isTextNode()))) {
-        m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
+        || !(selection().isContentEditable() || (mev.innerNode() && mev.innerNode()->isTextNode())))
+        return;
 
-        if (mev.hitTestResult().isMisspelled())
-            selectClosestMisspellingFromMouseEvent(mev);
-        else if (m_frame->editor().behavior().shouldSelectOnContextualMenuClick())
-            selectClosestWordOrLinkFromMouseEvent(mev);
-    }
+    m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
+
+    if (mev.hitTestResult().isMisspelled())
+        selectClosestMisspellingFromMouseEvent(mev);
+    else if (m_frame->editor().behavior().shouldSelectOnContextualMenuClick())
+        selectClosestWordOrLinkFromMouseEvent(mev);
 }
 
 void SelectionController::passMousePressEventToSubframe(const MouseEventWithHitTestResults& mev)
 {
     // If we're clicking into a frame that is selected, the frame will appear
     // greyed out even though we're clicking on the selection.  This looks
     // really strange (having the whole frame be greyed out), so we deselect the
     // selection.
     IntPoint p = m_frame->view()->rootFrameToContents(mev.event().position());
-    if (selection().contains(p)) {
-        VisiblePosition visiblePos(
-            mev.innerNode()->layoutObject()->positionForPoint(mev.localPoint()));
-        VisibleSelection newSelection(visiblePos);
-        selection().setSelection(newSelection);
-    }
+    if (!selection().contains(p))
+        return;
+
+    VisiblePosition visiblePos(
+        mev.innerNode()->layoutObject()->positionForPoint(mev.localPoint()));
+    VisibleSelection newSelection(visiblePos);
+    selection().setSelection(newSelection);
 }
 
 void SelectionController::initializeSelectionState()
 {
     m_selectionState = SelectionState::HaveNotStartedSelection;
 }
 
 void SelectionController::setMouseDownMayStartSelect(bool mayStartSelect)
 {
     m_mouseDownMayStartSelect = mayStartSelect;
 }
 
 bool SelectionController::mouseDownMayStartSelect() const
 {
     return m_mouseDownMayStartSelect;
 }
 
 bool SelectionController::mouseDownWasSingleClickInSelection() const
 {
     return m_mouseDownWasSingleClickInSelection;
 }
 
 FrameSelection& SelectionController::selection() const
 {
     return m_frame->selection();
 }
 
 } // namespace blink