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

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 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/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "cc/base/switches.h"
@@ skipping 176 matching lines @@
       gpu::GPU_FEATURE_TYPE_FORCE_COMPOSITING_MODE);
 }
 
 }  // namespace
 
 bool IsThreadedCompositingEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // Command line switches take precedence over blacklist.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode) ||
-      command_line.HasSwitch(switches::kDisableThreadedCompositing)) {
+      command_line.HasSwitch(switches::kDisableThreadedCompositing))
     return false;
-  } else if (command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
+  if (command_line.HasSwitch(switches::kEnableThreadedCompositing))
     return true;
-  }
 
 #if defined(USE_AURA) || defined(OS_MACOSX)
   // We always want threaded compositing on Aura and Mac (the fallback is a
   // threaded software compositor).
   return true;
-#endif
-
+#else
   if (!CanDoAcceleratedCompositing() || IsForceCompositingModeBlacklisted())
     return false;
 
 #if defined(OS_WIN)

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

nit: take out the OS_WIN section now since USE_AURA == OS_WIN

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

Done.

   // Windows Vista+ has been shipping with TCM enabled at 100% since M24 and
   // The blacklist check above takes care of returning false before this hits
   // on unsupported Win versions.
   return true;
+#else
+  return false;
 #endif
-
-  return false;
+#endif
 }
 
 bool IsForceCompositingModeEnabled() {
   // Force compositing mode is a subset of threaded compositing mode.
   if (IsThreadedCompositingEnabled())
     return true;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
   // Command line switches take precedence over blacklisting.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode))
     return false;
-  else if (command_line.HasSwitch(switches::kForceCompositingMode))
+  if (command_line.HasSwitch(switches::kForceCompositingMode))
     return true;
 
   if (!CanDoAcceleratedCompositing() || IsForceCompositingModeBlacklisted())
     return false;
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Windows Vista+ has been shipping with TCM enabled at 100% since M24 and
   // Mac OSX 10.8+ since M28. The blacklist check above takes care of returning
   // false before this hits on unsupported Win/Mac versions.
   return true;
+#else
+  return false;
 #endif
-
-  return false;
 }
 
 bool IsDelegatedRendererEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool enabled = false;
 
 #if defined(USE_AURA)
   // Enable on Aura.
   enabled = true;
 #endif
@@ skipping 141 matching lines @@
   return problem_list;
 }
 
 base::Value* GetDriverBugWorkarounds() {
   base::ListValue* workaround_list = new base::ListValue();
   GpuDataManagerImpl::GetInstance()->GetDriverBugWorkarounds(workaround_list);
   return workaround_list;
 }
 
 }  // namespace content