Chromium Code Reviews| Index: chrome/common/crash_keys.cc |
| diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc |
| index c1e0c5a3e5a3a0d68b2532f67cf467dda8c967e4..03980f9ff5353ed3f23e9d40e69258e196045c97 100644 |
| --- a/chrome/common/crash_keys.cc |
| +++ b/chrome/common/crash_keys.cc |
| @@ -92,6 +92,10 @@ const char kViewCount[] = "view-count"; |
| const char kZeroEncodeDetails[] = "zero-encode-details"; |
| +const char kBlinkSchedulerTaskFunctionName = |
| + "blink-scheduler-task-function-name"; |
| +const char kBlinkSchedulerTaskFileName = "blink-scheduler-task-file-name"; |
| + |
| size_t RegisterChromeCrashKeys() { |
| // The following keys may be chunked by the underlying crash logging system, |
| // but ultimately constitute a single key-value pair. |
| @@ -102,147 +106,151 @@ size_t RegisterChromeCrashKeys() { |
| // RegisterCrashKeysHelper(). |
| base::debug::CrashKey fixed_keys[] = { |
| #if defined(OS_MACOSX) || defined(OS_WIN) |
| - { kMetricsClientId, kSmallSize }, |
|
Robert Sesek
2016/10/31 14:32:32
Please leave this formatted as-is. It makes the di
alex clarke (OOO till 29th)
2016/10/31 15:51:10
Sorry that's what git cl format did. I'll revert.
|
| + {kMetricsClientId, kSmallSize}, |
| #else |
| - { kClientId, kSmallSize }, |
| + {kClientId, kSmallSize}, |
| #endif |
| - { kChannel, kSmallSize }, |
| - { kActiveURL, kLargeSize }, |
| - { kNumVariations, kSmallSize }, |
| - { kVariations, kLargeSize }, |
| - { kNumExtensionsCount, kSmallSize }, |
| - { kShutdownType, kSmallSize }, |
| + {kChannel, kSmallSize}, |
| + {kActiveURL, kLargeSize}, |
| + {kNumVariations, kSmallSize}, |
| + {kVariations, kLargeSize}, |
| + {kNumExtensionsCount, kSmallSize}, |
| + {kShutdownType, kSmallSize}, |
| #if !defined(OS_ANDROID) |
| - { kGPUVendorID, kSmallSize }, |
| - { kGPUDeviceID, kSmallSize }, |
| + {kGPUVendorID, kSmallSize}, |
| + {kGPUDeviceID, kSmallSize}, |
| #endif |
| - { kGPUDriverVersion, kSmallSize }, |
| - { kGPUPixelShaderVersion, kSmallSize }, |
| - { kGPUVertexShaderVersion, kSmallSize }, |
| + {kGPUDriverVersion, kSmallSize}, |
| + {kGPUPixelShaderVersion, kSmallSize}, |
| + {kGPUVertexShaderVersion, kSmallSize}, |
| #if defined(OS_MACOSX) |
| - { kGPUGLVersion, kSmallSize }, |
| + {kGPUGLVersion, kSmallSize}, |
| #elif defined(OS_POSIX) |
| - { kGPUVendor, kSmallSize }, |
| - { kGPURenderer, kSmallSize }, |
| + {kGPUVendor, kSmallSize}, |
| + {kGPURenderer, kSmallSize}, |
| #endif |
| // content/: |
| - { "bad_message_reason", kSmallSize }, |
| - { "discardable-memory-allocated", kSmallSize }, |
| - { "discardable-memory-free", kSmallSize }, |
| - { kFontKeyName, kSmallSize}, |
| - { "ppapi_path", kMediumSize }, |
| - { "subresource_url", kLargeSize }, |
| - { "total-discardable-memory-allocated", kSmallSize }, |
| + {"bad_message_reason", kSmallSize}, |
| + {"discardable-memory-allocated", kSmallSize}, |
| + {"discardable-memory-free", kSmallSize}, |
| + {kFontKeyName, kSmallSize}, |
| + {"ppapi_path", kMediumSize}, |
| + {"subresource_url", kLargeSize}, |
| + {"total-discardable-memory-allocated", kSmallSize}, |
| #if defined(OS_WIN) |
| - { kHungRendererOutstandingAckCount, kSmallSize }, |
| - { kHungRendererOutstandingEventType, kSmallSize }, |
| - { kHungRendererLastEventType, kSmallSize }, |
| - { kHungRendererReason, kSmallSize }, |
| - { kThirdPartyModulesLoaded, kSmallSize }, |
| - { kThirdPartyModulesNotLoaded, kSmallSize }, |
| + {kHungRendererOutstandingAckCount, kSmallSize}, |
| + {kHungRendererOutstandingEventType, kSmallSize}, |
| + {kHungRendererLastEventType, kSmallSize}, |
| + {kHungRendererReason, kSmallSize}, |
| + {kThirdPartyModulesLoaded, kSmallSize}, |
| + {kThirdPartyModulesNotLoaded, kSmallSize}, |
| #endif |
| #if defined(OS_CHROMEOS) |
| - { kNumberOfUsers, kSmallSize }, |
| + {kNumberOfUsers, kSmallSize}, |
| #endif |
| #if defined(OS_MACOSX) |
| - { mac::kFirstNSException, kMediumSize }, |
| - { mac::kFirstNSExceptionTrace, kMediumSize }, |
| - { mac::kLastNSException, kMediumSize }, |
| - { mac::kLastNSExceptionTrace, kMediumSize }, |
| - { mac::kNSException, kMediumSize }, |
| - { mac::kNSExceptionTrace, kMediumSize }, |
| - { mac::kSendAction, kMediumSize }, |
| - { mac::kZombie, kMediumSize }, |
| - { mac::kZombieTrace, kMediumSize }, |
| + {mac::kFirstNSException, kMediumSize}, |
| + {mac::kFirstNSExceptionTrace, kMediumSize}, |
| + {mac::kLastNSException, kMediumSize}, |
| + {mac::kLastNSExceptionTrace, kMediumSize}, |
| + {mac::kNSException, kMediumSize}, |
| + {mac::kNSExceptionTrace, kMediumSize}, |
| + {mac::kSendAction, kMediumSize}, |
| + {mac::kZombie, kMediumSize}, |
| + {mac::kZombieTrace, kMediumSize}, |
| // content/: |
| - { "channel_error_bt", kMediumSize }, |
| - { "remove_route_bt", kMediumSize }, |
| - { "rwhvm_window", kMediumSize }, |
| + {"channel_error_bt", kMediumSize}, |
| + {"remove_route_bt", kMediumSize}, |
| + {"rwhvm_window", kMediumSize}, |
| // media/: |
| #endif |
| #if BUILDFLAG(ENABLE_KASKO) |
| - { kKaskoGuid, kSmallSize }, |
| - { kKaskoEquivalentGuid, kSmallSize }, |
| + {kKaskoGuid, kSmallSize}, |
| + {kKaskoEquivalentGuid, kSmallSize}, |
| #endif |
| - { kBug464926CrashKey, kSmallSize }, |
| - { kViewCount, kSmallSize }, |
| + {kBug464926CrashKey, kSmallSize}, |
| + {kViewCount, kSmallSize}, |
| // media/: |
| #if defined(OS_WIN) |
| - { kHungAudioThreadDetails, kSmallSize }, |
| + {kHungAudioThreadDetails, kSmallSize}, |
| #endif |
| - { kZeroEncodeDetails, kSmallSize }, |
| + {kZeroEncodeDetails, kSmallSize}, |
| + |
| + // Temporary for https://crbug.com/660427 |
| + {"blink_scheduler_task_function_name", kSmallSize}, |
| + {"blink_scheduler_task_file_name", kSmallSize}, |
| // gin/: |
| - { "v8-ignition", kSmallSize }, |
| + {"v8-ignition", kSmallSize}, |
| // Temporary for http://crbug.com/575245. |
| - { "swapout_frame_id", kSmallSize }, |
| - { "swapout_proxy_id", kSmallSize }, |
| - { "swapout_view_id", kSmallSize }, |
| - { "commit_frame_id", kSmallSize }, |
| - { "commit_proxy_id", kSmallSize }, |
| - { "commit_view_id", kSmallSize }, |
| - { "commit_main_render_frame_id", kSmallSize }, |
| - { "newproxy_proxy_id", kSmallSize }, |
| - { "newproxy_view_id", kSmallSize }, |
| - { "newproxy_opener_id", kSmallSize }, |
| - { "newproxy_parent_id", kSmallSize }, |
| - { "rvinit_view_id", kSmallSize }, |
| - { "rvinit_proxy_id", kSmallSize }, |
| - { "rvinit_main_frame_id", kSmallSize }, |
| - { "initrf_frame_id", kSmallSize }, |
| - { "initrf_proxy_id", kSmallSize }, |
| - { "initrf_view_id", kSmallSize }, |
| - { "initrf_main_frame_id", kSmallSize }, |
| - { "initrf_view_is_live", kSmallSize }, |
| + {"swapout_frame_id", kSmallSize}, |
| + {"swapout_proxy_id", kSmallSize}, |
| + {"swapout_view_id", kSmallSize}, |
| + {"commit_frame_id", kSmallSize}, |
| + {"commit_proxy_id", kSmallSize}, |
| + {"commit_view_id", kSmallSize}, |
| + {"commit_main_render_frame_id", kSmallSize}, |
| + {"newproxy_proxy_id", kSmallSize}, |
| + {"newproxy_view_id", kSmallSize}, |
| + {"newproxy_opener_id", kSmallSize}, |
| + {"newproxy_parent_id", kSmallSize}, |
| + {"rvinit_view_id", kSmallSize}, |
| + {"rvinit_proxy_id", kSmallSize}, |
| + {"rvinit_main_frame_id", kSmallSize}, |
| + {"initrf_frame_id", kSmallSize}, |
| + {"initrf_proxy_id", kSmallSize}, |
| + {"initrf_view_id", kSmallSize}, |
| + {"initrf_main_frame_id", kSmallSize}, |
| + {"initrf_view_is_live", kSmallSize}, |
| // Temporary for https://crbug.com/591478. |
| - { "initrf_parent_proxy_exists", kSmallSize }, |
| - { "initrf_render_view_is_live", kSmallSize }, |
| - { "initrf_parent_is_in_same_site_instance", kSmallSize}, |
| - { "initrf_parent_process_is_live", kSmallSize}, |
| - { "initrf_root_is_in_same_site_instance", kSmallSize}, |
| - { "initrf_root_is_in_same_site_instance_as_parent", kSmallSize}, |
| - { "initrf_root_process_is_live", kSmallSize}, |
| - { "initrf_root_proxy_is_live", kSmallSize}, |
| + {"initrf_parent_proxy_exists", kSmallSize}, |
| + {"initrf_render_view_is_live", kSmallSize}, |
| + {"initrf_parent_is_in_same_site_instance", kSmallSize}, |
| + {"initrf_parent_process_is_live", kSmallSize}, |
| + {"initrf_root_is_in_same_site_instance", kSmallSize}, |
| + {"initrf_root_is_in_same_site_instance_as_parent", kSmallSize}, |
| + {"initrf_root_process_is_live", kSmallSize}, |
| + {"initrf_root_proxy_is_live", kSmallSize}, |
| // Temporary for https://crbug.com/626802. |
| - { "newframe_routing_id", kSmallSize }, |
| - { "newframe_proxy_id", kSmallSize }, |
| - { "newframe_opener_id", kSmallSize }, |
| - { "newframe_parent_id", kSmallSize }, |
| - { "newframe_widget_id", kSmallSize }, |
| - { "newframe_widget_hidden", kSmallSize }, |
| - { "newframe_replicated_origin", kSmallSize }, |
| - { "newframe_oopifs_possible", kSmallSize }, |
| + {"newframe_routing_id", kSmallSize}, |
| + {"newframe_proxy_id", kSmallSize}, |
| + {"newframe_opener_id", kSmallSize}, |
| + {"newframe_parent_id", kSmallSize}, |
| + {"newframe_widget_id", kSmallSize}, |
| + {"newframe_widget_hidden", kSmallSize}, |
| + {"newframe_replicated_origin", kSmallSize}, |
| + {"newframe_oopifs_possible", kSmallSize}, |
| // Temporary for https://crbug.com/630103. |
| - { "origin_mismatch_url", crash_keys::kLargeSize }, |
| - { "origin_mismatch_origin", crash_keys::kMediumSize }, |
| - { "origin_mismatch_transition", crash_keys::kSmallSize }, |
| - { "origin_mismatch_redirects", crash_keys::kSmallSize }, |
| - { "origin_mismatch_same_page", crash_keys::kSmallSize }, |
| + {"origin_mismatch_url", crash_keys::kLargeSize}, |
| + {"origin_mismatch_origin", crash_keys::kMediumSize}, |
| + {"origin_mismatch_transition", crash_keys::kSmallSize}, |
| + {"origin_mismatch_redirects", crash_keys::kSmallSize}, |
| + {"origin_mismatch_same_page", crash_keys::kSmallSize}, |
| // Temporary for https://crbug.com/612711. |
| - { "aci_wrong_sp_extension_id", kSmallSize }, |
| + {"aci_wrong_sp_extension_id", kSmallSize}, |
| // Temporary for https://crbug.com/616149. |
| - { "existing_extension_pref_value_type", crash_keys::kSmallSize }, |
| + {"existing_extension_pref_value_type", crash_keys::kSmallSize}, |
| // Temporary for https://crbug.com/630495. |
| - { "swdh_register_cannot_host_url", crash_keys::kLargeSize }, |
| - { "swdh_register_cannot_scope_url", crash_keys::kLargeSize }, |
| - { "swdh_register_cannot_script_url", crash_keys::kLargeSize }, |
| + {"swdh_register_cannot_host_url", crash_keys::kLargeSize}, |
| + {"swdh_register_cannot_scope_url", crash_keys::kLargeSize}, |
| + {"swdh_register_cannot_script_url", crash_keys::kLargeSize}, |
| // Temporary for https://crbug.com/619294. |
| - { "swdh_unregister_cannot_host_url", crash_keys::kLargeSize }, |
| - { "swdh_unregister_cannot_scope_url", crash_keys::kLargeSize }, |
| + {"swdh_unregister_cannot_host_url", crash_keys::kLargeSize}, |
| + {"swdh_unregister_cannot_scope_url", crash_keys::kLargeSize}, |
| // Temporary for https://crbug.com/630496. |
| - { "swdh_get_registration_cannot_host_url", crash_keys::kLargeSize }, |
| - { "swdh_get_registration_cannot_document_url", crash_keys::kLargeSize }, |
| + {"swdh_get_registration_cannot_host_url", crash_keys::kLargeSize}, |
| + {"swdh_get_registration_cannot_document_url", crash_keys::kLargeSize}, |
| }; |
| // This dynamic set of keys is used for sets of key value pairs when gathering |