| Index: cc/layers/layer.cc
|
| diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
|
| index 7110dc70812c7987694b81fb8549345cc0c88d2d..31a8bb49b6af781d8683ab304cafc1df7b797834 100644
|
| --- a/cc/layers/layer.cc
|
| +++ b/cc/layers/layer.cc
|
| @@ -875,12 +875,8 @@ void Layer::PushPropertiesTo(LayerImpl* layer) {
|
| bool is_tracing;
|
| TRACE_EVENT_CATEGORY_GROUP_ENABLED(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
|
| &is_tracing);
|
| - if (is_tracing) {
|
| - layer->SetDebugName(DebugName());
|
| + if (is_tracing)
|
| layer->SetDebugInfo(TakeDebugInfo());
|
| - } else {
|
| - layer->SetDebugName(std::string());
|
| - }
|
|
|
| layer->SetDoubleSided(double_sided_);
|
| layer->SetDrawCheckerboardForMissingTiles(
|
| @@ -1033,10 +1029,6 @@ bool Layer::NeedMoreUpdates() {
|
| return false;
|
| }
|
|
|
| -std::string Layer::DebugName() {
|
| - return client_ ? client_->DebugName() : std::string();
|
| -}
|
| -
|
| scoped_refptr<base::debug::ConvertableToTraceFormat> Layer::TakeDebugInfo() {
|
| if (client_)
|
| return client_->TakeDebugInfo();
|
|
|