Index: cc/layer_tree_host.h |
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h |
index 5056345d07c8fb6810413415eaf7fc2993842adf..7c9793c597ac4bddf7492eef9692c7e331566bbb 100644 |
--- a/cc/layer_tree_host.h |
+++ b/cc/layer_tree_host.h |
@@ -16,6 +16,7 @@ |
#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" |
@@ -40,13 +41,11 @@ struct hash<WebKit::WebGraphicsContext3D*> { |
namespace cc { |
-class FontAtlas; |
class Layer; |
class LayerTreeHostImpl; |
class LayerTreeHostImplClient; |
class PrioritizedResourceManager; |
class ResourceUpdateQueue; |
-class HeadsUpDisplayLayer; |
class Region; |
struct ScrollAndScaleSet; |
@@ -56,14 +55,6 @@ struct CC_EXPORT 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; |
@@ -77,8 +68,7 @@ struct CC_EXPORT LayerTreeSettings { |
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 |
@@ -216,10 +206,11 @@ public: |
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(); |
+ |
+ void setHudLayerSettings(const HeadsUpDisplayLayerSettings& settings); |
+ const HeadsUpDisplayLayerSettings& hudLayerSettings() const { return m_localHUDLayerSettings; } |
Proxy* proxy() const { return m_proxy.get(); } |
@@ -248,8 +239,6 @@ private: |
bool animateLayersRecursive(Layer* current, base::TimeTicks time); |
void setAnimationEventsRecursive(const AnimationEventsVector&, Layer*, base::Time wallClockTime); |
- void createHUDLayerIfNeeded(); |
- |
bool m_animating; |
bool m_needsAnimateLayers; |
@@ -273,6 +262,7 @@ private: |
scoped_ptr<PrioritizedResource> m_surfaceMemoryPlaceholder; |
LayerTreeSettings m_settings; |
+ HeadsUpDisplayLayerSettings m_localHUDLayerSettings; |
gfx::Size m_layoutViewportSize; |
gfx::Size m_deviceViewportSize; |