Unified OutputSurface::SwapBuffers.

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 131 matching lines @@
       cmd->HasSwitch(cc::switches::kEnableTopControlsPositionCalculation);
   if (cmd->HasSwitch(cc::switches::kTopControlsHeight)) {
     std::string controls_height_str =
         cmd->GetSwitchValueASCII(cc::switches::kTopControlsHeight);
     double controls_height;
     if (base::StringToDouble(controls_height_str, &controls_height) &&
         controls_height > 0)
       settings.top_controls_height = controls_height;
   }
 
-  settings.compositor_frame_message =
-      cmd->HasSwitch(cc::switches::kEnableCompositorFrameMessage) ||
-      cmd->HasSwitch(cc::switches::kCompositeToMailbox) ||
-      cmd->HasSwitch(switches::kEnableSoftwareCompositingGLAdapter);
-
   if (settings.calculate_top_controls_position &&
-      (settings.top_controls_height <= 0 ||
-       !settings.compositor_frame_message)) {
-    DCHECK(false) << "Top controls repositioning enabled without valid height "
-                     "or compositor_frame_message set.";
+      settings.top_controls_height <= 0) {
+    DCHECK(false)
+        << "Top controls repositioning enabled without valid height set.";
     settings.calculate_top_controls_position = false;
   }
 
   if (cmd->HasSwitch(cc::switches::kTopControlsShowThreshold)) {
       std::string top_threshold_str =
           cmd->GetSwitchValueASCII(cc::switches::kTopControlsShowThreshold);
       double show_threshold;
       if (base::StringToDouble(top_threshold_str, &show_threshold) &&
           show_threshold >= 0.f && show_threshold <= 1.f)
         settings.top_controls_show_threshold = show_threshold;
@@ skipping 397 matching lines @@
   return RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
 }
 
 scoped_refptr<cc::ContextProvider>
 RenderWidgetCompositor::OffscreenContextProviderForCompositorThread() {
   return RenderThreadImpl::current()->
       OffscreenContextProviderForCompositorThread();
 }
 
 }  // namespace content