diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-26 04:15:51 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-26 04:15:51 +0000 |
| commit | 2cc9143a552bb4d576249f65e55c45762341f946 (patch) | |
| tree | af40cb33eddfe4f13b527a8e343510b18057f450 /ui/gfx/compositor | |
| parent | 31c1a7e8aa6c07d5eb9c2ab4b303d20f33723d58 (diff) | |
| download | chromium_src-2cc9143a552bb4d576249f65e55c45762341f946.zip chromium_src-2cc9143a552bb4d576249f65e55c45762341f946.tar.gz chromium_src-2cc9143a552bb4d576249f65e55c45762341f946.tar.bz2 | |
aura/cc: add FPS / show layer tree switches
BUG=None
TEST=run chrome --ui-show-fps-counter and --ui-show-layer-tree
Review URL: http://codereview.chromium.org/8636025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/compositor')
| -rw-r--r-- | ui/gfx/compositor/compositor_cc.cc | 7 | ||||
| -rw-r--r-- | ui/gfx/compositor/compositor_switches.cc | 6 | ||||
| -rw-r--r-- | ui/gfx/compositor/compositor_switches.h | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ui/gfx/compositor/compositor_cc.cc b/ui/gfx/compositor/compositor_cc.cc index 71e820c..b22dc858 100644 --- a/ui/gfx/compositor/compositor_cc.cc +++ b/ui/gfx/compositor/compositor_cc.cc @@ -4,12 +4,14 @@ #include "ui/gfx/compositor/compositor_cc.h" +#include "base/command_line.h" #include "third_party/skia/include/images/SkImageEncoder.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFloatPoint.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "ui/gfx/compositor/compositor_switches.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/gl/gl_context.h" #include "ui/gfx/gl/gl_surface.h" @@ -125,6 +127,11 @@ CompositorCC::CompositorCC(CompositorDelegate* delegate, widget_(widget), root_web_layer_(WebKit::WebLayer::create(this)) { WebKit::WebLayerTreeView::Settings settings; + CommandLine* command_line = CommandLine::ForCurrentProcess(); + settings.showFPSCounter = + command_line->HasSwitch(switches::kUIShowFPSCounter); + settings.showPlatformLayerTree = + command_line->HasSwitch(switches::kUIShowLayerTree); settings.enableCompositorThread = !!g_compositor_thread; host_ = WebKit::WebLayerTreeView::create(this, root_web_layer_, settings); root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f)); diff --git a/ui/gfx/compositor/compositor_switches.cc b/ui/gfx/compositor/compositor_switches.cc index 0fa4d7a..ab05c8a 100644 --- a/ui/gfx/compositor/compositor_switches.cc +++ b/ui/gfx/compositor/compositor_switches.cc @@ -9,7 +9,13 @@ namespace switches { const char kEnableCompositorOverdrawDebugging[] = "enable-compositor-overdraw-debugging"; +// Show FPS counter. +const char kUIShowFPSCounter[] = "ui-show-fps-counter"; + // Show colored borders around layers. const char kUIShowLayerBorders[] = "ui-show-layer-borders"; +// Show layer tree. +const char kUIShowLayerTree[] = "ui-show-layer-tree"; + } // namespace switches diff --git a/ui/gfx/compositor/compositor_switches.h b/ui/gfx/compositor/compositor_switches.h index 01f0ff7..83ea15a 100644 --- a/ui/gfx/compositor/compositor_switches.h +++ b/ui/gfx/compositor/compositor_switches.h @@ -11,7 +11,9 @@ namespace switches { COMPOSITOR_EXPORT extern const char kEnableCompositorOverdrawDebugging[]; +COMPOSITOR_EXPORT extern const char kUIShowFPSCounter[]; COMPOSITOR_EXPORT extern const char kUIShowLayerBorders[]; +COMPOSITOR_EXPORT extern const char kUIShowLayerTree[]; } // namespace switches |