Add support for calculating the position of the top controls in the cc layer.

cc/layer_tree_settings.cc

 // Copyright 2011 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 "cc/layer_tree_settings.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "cc/switches.h"
 
 namespace cc {
 
 LayerTreeSettings::LayerTreeSettings()
     : acceleratePainting(false)
     , compositorFrameMessage(false)
     , implSidePainting(false)
     , renderVSyncEnabled(true)
     , perTilePaintingEnabled(false)
     , partialSwapEnabled(false)
     , acceleratedAnimationEnabled(true)
     , pageScalePinchZoomEnabled(false)
     , backgroundColorInsteadOfCheckerboard(false)
     , showOverdrawInTracing(false)
     , canUseLCDText(true)
     , shouldClearRootRenderPass(true)
     , useLinearFadeScrollbarAnimator(false)
+    , calculateTopControlsPosition(false)
     , refreshRate(0)
     , maxPartialTextureUpdates(std::numeric_limits<size_t>::max())
     , numRasterThreads(1)
+    , topControlsHeightPx(0)
     , defaultTileSize(gfx::Size(256, 256))
     , maxUntiledLayerSize(gfx::Size(512, 512))
     , minimumOcclusionTrackingSize(gfx::Size(160, 160))
 {
     // TODO(danakj): Move this to chromium when we don't go through the WebKit API anymore.
     compositorFrameMessage = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableCompositorFrameMessage);
     implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting);
     partialSwapEnabled = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePartialSwap);
     backgroundColorInsteadOfCheckerboard = CommandLine::ForCurrentProcess()->HasSwitch(switches::kBackgroundColorInsteadOfCheckerboard);
     showOverdrawInTracing = CommandLine::ForCurrentProcess()->HasSwitch(switches::kTraceOverdraw);
 
+    calculateTopControlsPosition = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTopControlsPositionCalculation);

[jamesr, 2013/01/08 02:26:48]

I don't understand how this could work for both the browser and render process
embeddings of cc, since they'll have the same command line flags but you don't
want both to have the top controls stuff.  Rather than checking the command line
flags here in cc/switches.cc, you should check whichever flags you care about in
the code embedding cc/ and set the LayerTreeHostSettings there

[Ted C, 2013/01/08 18:17:33]

Hmm...so move this check to web_layer_tree_view_impl?  It doesn't look to be
doing anything like this there currently, so I just wanted to confirm that is
the right place.  That is until your change lands and it gets refactored into
render_widget, which I guess it would go there instead.

[Ted C, 2013/01/09 23:36:01]

I just uploaded a patch where I moved it to web_layer_tree_view_impl.  Let me
know if that isn't the right place.

+    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTopControlsHeight)) {
+        std::string controls_height_str =
+            CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kTopControlsHeight);
+        int controls_height;
+        if (base::StringToInt(controls_height_str, &controls_height) && controls_height > 0)
+            topControlsHeightPx = controls_height;
+    }
+    if (calculateTopControlsPosition && (topControlsHeightPx <= 0 || !compositorFrameMessage)) {
+        DCHECK(false) << "Top controls repositioning enabled without valid height or compositorFrameMessage set.";
+        calculateTopControlsPosition = false;
+    }
+
 // TODO(alokp): Remove this hard-coded setting.
 // Platforms that need to disable LCD text must explicitly set this value.
 #if defined(OS_ANDROID)
     canUseLCDText = false;
 #endif
 
 #if defined(OS_ANDROID)
     // TODO(danakj): Move this out to the android code.
     maxPartialTextureUpdates = 0;
 #endif
@@ skipping 25 matching lines @@
                 num_raster_threads;
         }
     }
 }
 
 LayerTreeSettings::~LayerTreeSettings()
 {
 }
 
 }  // namespace cc