diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 01:10:30 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 01:10:30 +0000 |
| commit | dc6c55257f665c63e3fd10fa3610bd097ec1e880 (patch) | |
| tree | e95da14a21214e73afc64a29246177d6d7e23347 /webkit | |
| parent | 5016a9dde9a77b4801bf4126317ab2a271be0768 (diff) | |
| download | chromium_src-dc6c55257f665c63e3fd10fa3610bd097ec1e880.zip chromium_src-dc6c55257f665c63e3fd10fa3610bd097ec1e880.tar.gz chromium_src-dc6c55257f665c63e3fd10fa3610bd097ec1e880.tar.bz2 | |
cc: Avoid expensive RenderingStats collection.
When --enable-gpu-benchmarking is not present, don't do expensive
steps in the benchmark collection (meaning don't call
base::TimeTicks::Now()).
BUG=170735
NOTRY=true
Depends on: https://bugs.webkit.org/show_bug.cgi?id=108358
Review URL: https://chromiumcodereview.appspot.com/12095053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/compositor_bindings/web_layer_tree_view_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc index 2b4d835..2b71187 100644 --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc @@ -53,6 +53,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti settings.initialDebugState.showPlatformLayerTree = webSettings.showPlatformLayerTree; settings.initialDebugState.showDebugBorders = webSettings.showDebugBorders; settings.implSidePainting = CommandLine::ForCurrentProcess()->HasSwitch(cc::switches::kEnableImplSidePainting); + settings.recordRenderingStats = webSettings.recordRenderingStats; settings.calculateTopControlsPosition = CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTopControlsPositionCalculation); if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTopControlsHeight)) { diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index f5f6886..a583954 100644 --- a/webkit/glue/webpreferences.cc +++ b/webkit/glue/webpreferences.cc @@ -140,6 +140,7 @@ WebPreferences::WebPreferences() #endif supports_multiple_windows(true), viewport_enabled(false), + record_rendering_stats(false), cookie_enabled(true) #if defined(OS_ANDROID) , @@ -382,6 +383,9 @@ void WebPreferences::Apply(WebView* web_view) const { // overlay of rects, if requested on the command line. settings->setShowPaintRects(show_paint_rects); + // Record rendering stats for benchmarks. + settings->setRecordRenderingStats(record_rendering_stats); + // Set whether to throttle framerate to Vsync. settings->setRenderVSyncEnabled(render_vsync_enabled); diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h index d11b634..6f1861a 100644 --- a/webkit/glue/webpreferences.h +++ b/webkit/glue/webpreferences.h @@ -155,6 +155,7 @@ struct WEBKIT_GLUE_EXPORT WebPreferences { EditingBehavior editing_behavior; bool supports_multiple_windows; bool viewport_enabled; + bool record_rendering_stats; // This flags corresponds to a Page's Settings' setCookieEnabled state. It // only controls whether or not the "document.cookie" field is properly |