Fix "unreachable code" warnings (MSVC warning 4702) in content/.

content/browser/renderer_host/input/gesture_event_queue.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/gesture_event_queue.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/browser/renderer_host/input/input_router.h"
@@ skipping 66 matching lines @@
             base::TimeDelta::FromMilliseconds(debounce_interval_time_ms_),
             this,
             &GestureEventQueue::SendScrollEndingEventsNow);
       } else {
         // Extend the bounce interval.
         debounce_deferring_timer_.Reset();
       }
       scrolling_in_progress_ = true;
       debouncing_deferral_queue_.clear();
       return true;
+

[jam, 2014/03/19 16:44:36]

ditto

[Peter Kasting, 2014/03/19 21:10:57]

Done.

     case WebInputEvent::GesturePinchBegin:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate:
       // TODO(rjkroege): Debounce pinch (http://crbug.com/147647)
       return true;
+
     default:
-      if (scrolling_in_progress_) {
+      if (scrolling_in_progress_)
         debouncing_deferral_queue_.push_back(gesture_event);
-        return false;
-      }
-      return true;
+      return !scrolling_in_progress_;

[jam, 2014/03/19 16:44:36]

leave the code as before; I think it's more readable before as well. but
orthogonality, it seems that when making any changes to code, it's not good
practice to change code from one valid style to another valid style just because
one prefers a different style. otherwise we'd get a lot of hysteresis in the
code.

[Peter Kasting, 2014/03/19 21:10:57]

Done.  Sorry, I didn't view this as a "style change" (the way the newlines
between cases are), just thought there was an opportunity to make the code
simpler.

   }
-
-  NOTREACHED();
-  return false;
 }
 
 // NOTE: The filters are applied successively. This simplifies the change.
 bool GestureEventQueue::ShouldForward(
     const GestureEventWithLatencyInfo& gesture_event) {
   TRACE_EVENT0("input", "GestureEventQueue::ShouldForward");
   return ShouldForwardForZeroVelocityFlingStart(gesture_event) &&
       ShouldForwardForBounceReduction(gesture_event) &&
       ShouldForwardForGFCFiltering(gesture_event) &&
       ShouldForwardForTapSuppression(gesture_event) &&
@@ skipping 31 matching lines @@
           ShouldDeferGestureShowPress(gesture_event);
     case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapUnconfirmed:
     case WebInputEvent::GestureDoubleTap:
       return !touchscreen_tap_suppression_controller_->
           ShouldSuppressGestureTapEnd();
     default:
       return true;
   }
-  NOTREACHED();
-  return false;
 }
 
 bool GestureEventQueue::ShouldForwardForCoalescing(
     const GestureEventWithLatencyInfo& gesture_event) {
   switch (gesture_event.event.type) {
     case WebInputEvent::GestureFlingCancel:
       fling_in_progress_ = false;
       break;
     case WebInputEvent::GestureFlingStart:
       fling_in_progress_ = true;
@@ skipping 205 matching lines @@
 
 void GestureEventQueue::EnqueueEvent(
     const GestureEventWithLatencyInfo& gesture_event) {
   coalesced_gesture_events_.push_back(gesture_event);
   // Scroll and pinch events contributing to |combined_scroll_pinch_| will be
   // manually added to the queue in |MergeOrInsertScrollAndPinchEvent()|.
   combined_scroll_pinch_ = gfx::Transform();
 }
 
 }  // namespace content