Fix frame viewer: LayerTypeAsString() can't be called from ~LayerImpl

For details on the fix see:
https://code.google.com/p/trace-viewer/source/detail?r=1165

R=enne@chromium.org

Review URL: https://codereview.chromium.org/179063003

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

2 files changed, 17 insertions, 0 deletions

diff --git a/cc/debug/traced_value.cc b/cc/debug/traced_value.cc
index 5a32414..3b506ae 100644
--- a/cc/debug/traced_value.cc
+++ b/cc/debug/traced_value.cc
@@ -30,6 +30,17 @@ void TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
   MakeDictIntoImplicitSnapshot(dict, object_name, id);
 }
 
+void TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
+    const char* category,
+    base::DictionaryValue* dict,
+    const char* object_base_type_name,
+    const char* object_name,
+    const void* id) {
+  dict->SetString("cat", category);
+  dict->SetString("base_type", object_base_type_name);
+  MakeDictIntoImplicitSnapshot(dict, object_name, id);
+}
+
 scoped_refptr<base::debug::ConvertableToTraceFormat> TracedValue::FromValue(
     base::Value* value) {
   return scoped_refptr<base::debug::ConvertableToTraceFormat>(
diff --git a/cc/debug/traced_value.h b/cc/debug/traced_value.h
index fe17695..e96c09a 100644
--- a/cc/debug/traced_value.h
+++ b/cc/debug/traced_value.h
@@ -26,6 +26,12 @@ class TracedValue : public base::debug::ConvertableToTraceFormat {
       base::DictionaryValue* dict,
       const char* object_name,
       const void* id);
+  static void MakeDictIntoImplicitSnapshotWithCategory(
+      const char* category,
+      base::DictionaryValue* dict,
+      const char* object_base_type_name,
+      const char* object_name,
+      const void* id);
   static scoped_refptr<base::debug::ConvertableToTraceFormat> FromValue(
       base::Value* value);