cc: handling debug settings in new LayerTreeDebugState structure

cc/layer_tree_host.h

 // 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.
 
 #ifndef CC_LAYER_TREE_HOST_H_
 #define CC_LAYER_TREE_HOST_H_
 
 #include <limits>
 
 #include "base/basictypes.h"
 #include "base/cancelable_callback.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "cc/animation_events.h"
 #include "cc/cc_export.h"
 #include "cc/graphics_context.h"
+#include "cc/heads_up_display_layer.h"
 #include "cc/layer_tree_host_client.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/occlusion_tracker.h"
 #include "cc/prioritized_resource_manager.h"
 #include "cc/proxy.h"
 #include "cc/rate_limiter.h"
 #include "cc/rendering_stats.h"
 #include "cc/scoped_ptr_vector.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/rect.h"
 
 #if defined(COMPILER_GCC)
 namespace BASE_HASH_NAMESPACE {
 template<>
 struct hash<WebKit::WebGraphicsContext3D*> {
   size_t operator()(WebKit::WebGraphicsContext3D* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 } // namespace BASE_HASH_NAMESPACE
 #endif // COMPILER
 
 namespace cc {
 
-class FontAtlas;
 class Layer;
 class LayerTreeHostImpl;
 class LayerTreeHostImplClient;
 class PrioritizedResourceManager;
 class ResourceUpdateQueue;
-class HeadsUpDisplayLayer;
 class Region;
 struct ScrollAndScaleSet;
 
 struct CC_EXPORT LayerTreeSettings {
     LayerTreeSettings();
     ~LayerTreeSettings();
 
     bool acceleratePainting;
     bool showDebugBorders;
-    bool showPlatformLayerTree;
-    bool showPaintRects;
-    bool showPropertyChangedRects;
-    bool showSurfaceDamageRects;
-    bool showScreenSpaceRects;
-    bool showReplicaScreenSpaceRects;
-    bool showOccludingRects;
-    bool showNonOccludingRects;
     bool renderVSyncEnabled;
     bool perTilePaintingEnabled;
     bool partialSwapEnabled;
     bool acceleratedAnimationEnabled;
     bool pageScalePinchZoomEnabled;
     bool backgroundColorInsteadOfCheckerboard;
     bool showOverdrawInTracing;
     double refreshRate;
     size_t maxPartialTextureUpdates;
     gfx::Size defaultTileSize;
     gfx::Size maxUntiledLayerSize;
     gfx::Size minimumOcclusionTrackingSize;
 
-    bool showDebugInfo() const { return showPlatformLayerTree || showDebugRects(); }
-    bool showDebugRects() const { return showPaintRects || showPropertyChangedRects || showSurfaceDamageRects || showScreenSpaceRects || showReplicaScreenSpaceRects || showOccludingRects || showNonOccludingRects; }
+    HeadsUpDisplayLayerSettings globalHudLayerSettings;

[egraether, 2012/11/20 21:30:30]

substructure for the commandline settings

[danakj, 2012/11/20 22:12:22]

rename to initial instead of global?

 };
 
 // Provides information on an Impl's rendering capabilities back to the LayerTreeHost
 struct CC_EXPORT RendererCapabilities {
     RendererCapabilities();
     ~RendererCapabilities();
 
     GLenum bestTextureFormat;
     bool contextHasCachedFrontBuffer;
     bool usingPartialSwap;
@@ skipping 117 matching lines @@
 
     // RateLimitClient implementation
     virtual void rateLimit() OVERRIDE;
 
     bool bufferedUpdates();
     bool requestPartialTextureUpdate();
 
     void setDeviceScaleFactor(float);
     float deviceScaleFactor() const { return m_deviceScaleFactor; }
 
-    void setShowFPSCounter(bool show);
-    void setFontAtlas(scoped_ptr<FontAtlas>);
+    HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
+    HeadsUpDisplayLayer* requestHudLayer();
 
-    HeadsUpDisplayLayer* hudLayer() const { return m_hudLayer.get(); }
+    void setHudLayerSettings(const HeadsUpDisplayLayerSettings& settings);
+    const HeadsUpDisplayLayerSettings& hudLayerSettings() const { return m_localHUDLayerSettings; }
 
     Proxy* proxy() const { return m_proxy.get(); }
 
 protected:
     LayerTreeHost(LayerTreeHostClient*, const LayerTreeSettings&);
     bool initialize(scoped_ptr<Thread> implThread);
 
 private:
     typedef std::vector<scoped_refptr<Layer> > LayerList;
 
     void initializeRenderer();
 
     void update(Layer*, ResourceUpdateQueue&, const OcclusionTracker*);
     bool paintLayerContents(const LayerList&, ResourceUpdateQueue&);
     bool paintMasksForRenderSurface(Layer*, ResourceUpdateQueue&);
 
     void updateLayers(Layer*, ResourceUpdateQueue&);
     void triggerPrepaint();
 
     void prioritizeTextures(const LayerList&, OverdrawMetrics&); 
     void setPrioritiesForSurfaces(size_t surfaceMemoryBytes);
     void setPrioritiesForLayers(const LayerList&);
     size_t calculateMemoryForRenderSurfaces(const LayerList& updateList);
 
     void animateLayers(base::TimeTicks monotonicTime);
     bool animateLayersRecursive(Layer* current, base::TimeTicks time);
     void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime);
 
-    void createHUDLayerIfNeeded();
-
     bool m_animating;
     bool m_needsAnimateLayers;
 
     base::CancelableClosure m_prepaintCallback;
 
     LayerTreeHostClient* m_client;
     scoped_ptr<Proxy> m_proxy;
 
     int m_commitNumber;
     RenderingStats m_renderingStats;
 
     bool m_rendererInitialized;
     bool m_contextLost;
     int m_numTimesRecreateShouldFail;
     int m_numFailedRecreateAttempts;
 
     scoped_refptr<Layer> m_rootLayer;
     scoped_refptr<HeadsUpDisplayLayer> m_hudLayer;
 
     scoped_ptr<PrioritizedResourceManager> m_contentsTextureManager;
     scoped_ptr<PrioritizedResource> m_surfaceMemoryPlaceholder;
 
     LayerTreeSettings m_settings;
+    HeadsUpDisplayLayerSettings m_localHUDLayerSettings;
 
     gfx::Size m_layoutViewportSize;
     gfx::Size m_deviceViewportSize;
     float m_deviceScaleFactor;
 
     bool m_visible;
 
     typedef base::hash_map<WebKit::WebGraphicsContext3D*, scoped_refptr<RateLimiter> > RateLimiterMap;
     RateLimiterMap m_rateLimiters;
 
     float m_pageScaleFactor;
     float m_minPageScaleFactor, m_maxPageScaleFactor;
     WebKit::WebTransformationMatrix m_implTransform;
     bool m_triggerIdleUpdates;
 
     SkColor m_backgroundColor;
     bool m_hasTransparentBackground;
 
     typedef ScopedPtrVector<PrioritizedResource> TextureList;
     size_t m_partialTextureUpdateRequests;
 
     static bool s_needsFilterContext;
 
     DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYER_TREE_HOST_H_