Add debug shortcuts that toggles options to shows paint rects, debug borders and fps counters.

Cleanup: Separate desktop shortcuts which are useful only on linux desktop, and debug shortcuts.

BUG=227375

Review URL: https://chromiumcodereview.appspot.com/14050009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195733 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 0 deletions

diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 6f65e8a..8477cfb 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -757,6 +757,15 @@ Compositor::OffscreenContextProviderForCompositorThread() {
       OffscreenContextProviderForCompositorThread();
 }
 
+const cc::LayerTreeDebugState& Compositor::GetLayerTreeDebugState() const {
+  return host_->debug_state();
+}
+
+void Compositor::SetLayerTreeDebugState(
+    const cc::LayerTreeDebugState& debug_state) {
+  host_->SetDebugState(debug_state);
+}
+
 scoped_refptr<CompositorLock> Compositor::GetCompositorLock() {
   if (!compositor_lock_) {
     compositor_lock_ = new CompositorLock(this);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 5777d65..10c6979 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -31,6 +31,7 @@ class RunLoop;
 namespace cc {
 class ContextProvider;
 class Layer;
+class LayerTreeDebugState;
 class LayerTreeHost;
 }
 
@@ -363,6 +364,9 @@ class COMPOSITOR_EXPORT Compositor
 
   bool IsLocked() { return compositor_lock_ != NULL; }
 
+  const cc::LayerTreeDebugState& GetLayerTreeDebugState() const;
+  void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state);
+
  private:
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;