diff options
| -rw-r--r-- | cc/output/gl_renderer.cc | 2 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.cc | 3 | ||||
| -rw-r--r-- | cc/trees/layer_tree_settings.h | 3 | ||||
| -rw-r--r-- | content/browser/renderer_host/compositor_impl_android.cc | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc index 1afb384..b89c91a 100644 --- a/cc/output/gl_renderer.cc +++ b/cc/output/gl_renderer.cc @@ -146,7 +146,7 @@ bool GLRenderer::Initialize() { if (!context_->makeContextCurrent()) return false; - context_->pushGroupMarkerEXT("CompositorContext"); + context_->pushGroupMarkerEXT(Settings().compositor_name.c_str()); std::string extensions_string = UTF16ToASCII(context_->getString(GL_EXTENSIONS)); diff --git a/cc/trees/layer_tree_settings.cc b/cc/trees/layer_tree_settings.cc index a68e7e1..422dbc8 100644 --- a/cc/trees/layer_tree_settings.cc +++ b/cc/trees/layer_tree_settings.cc @@ -55,7 +55,8 @@ LayerTreeSettings::LayerTreeSettings() highp_threshold_min(0), force_direct_layer_drawing(false), strict_layer_property_change_checking(false), - use_map_image(false) { + use_map_image(false), + compositor_name("ChromiumCompositor") { // TODO(danakj): Renable surface caching when we can do it more realiably. // crbug.com/170713 cache_render_pass_contents = false; diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h index 7229055..e7c0f45 100644 --- a/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h @@ -5,6 +5,8 @@ #ifndef CC_TREES_LAYER_TREE_SETTINGS_H_ #define CC_TREES_LAYER_TREE_SETTINGS_H_ +#include <string> + #include "base/basictypes.h" #include "cc/base/cc_export.h" #include "cc/debug/layer_tree_debug_state.h" @@ -60,6 +62,7 @@ class CC_EXPORT LayerTreeSettings { bool force_direct_layer_drawing; // With Skia GPU backend. bool strict_layer_property_change_checking; bool use_map_image; + std::string compositor_name; LayerTreeDebugState initial_debug_state; }; diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 02bd1f6..8839c21 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -201,6 +201,7 @@ void CompositorImpl::SetVisible(bool visible) { host_.reset(); } else if (!host_) { cc::LayerTreeSettings settings; + settings.compositor_name = "BrowserCompositor"; settings.refresh_rate = 60.0; settings.impl_side_painting = false; settings.calculate_top_controls_position = false; |