Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / crash_keys.cc

diff --git a/src/chrome/common/crash_keys.cc b/src/chrome/common/crash_keys.cc
index 84a83ef..b96a3ac 100644 (file)
--- a/src/chrome/common/crash_keys.cc
+++ b/src/chrome/common/crash_keys.cc
@@ -61,6 +61,8 @@ const char kChannel[] = "channel";
 
 const char kActiveURL[] = "url-chunk";
 
+const char kFontKeyName[] = "font_key_name";
+
 const char kSwitch[] = "switch-%" PRIuS;
 const char kNumSwitches[] = "num-switches";
 
@@ -143,7 +145,9 @@ size_t RegisterChromeCrashKeys() {
 
     // base/:
     { "dm-usage", kSmallSize },
+    { "total-dm-usage", kSmallSize },
     // content/:
+    { kFontKeyName, kSmallSize},
     { "ppapi_path", kMediumSize },
     { "subresource_url", kLargeSize },
 #if defined(OS_CHROMEOS)
@@ -262,8 +266,7 @@ static bool IsBoringSwitch(const std::string& flag) {
          flag == "--flag-switches-begin" ||
          flag == "--flag-switches-end";
 #elif defined(OS_CHROMEOS)
-  static const char* kIgnoreSwitches[] = {
-    ::switches::kEnableCompositingForFixedPosition,
+  static const char* const kIgnoreSwitches[] = {
     ::switches::kEnableImplSidePainting,
     ::switches::kEnableLogging,
     ::switches::kFlagSwitchesBegin,