diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 22:24:38 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 22:24:38 +0000 |
| commit | fddd6e9b0b5bc63f18ad7d4e4b7ce465c75122f1 (patch) | |
| tree | a0c62f54f1722a01246afa40dce2465bc2b8bf51 | |
| parent | 032bfc439fbac7f08f562d6914b960008ce64bd4 (diff) | |
| download | chromium_src-fddd6e9b0b5bc63f18ad7d4e4b7ce465c75122f1.zip chromium_src-fddd6e9b0b5bc63f18ad7d4e4b7ce465c75122f1.tar.gz chromium_src-fddd6e9b0b5bc63f18ad7d4e4b7ce465c75122f1.tar.bz2 | |
Fix UMA action hashes for software renderer.
The lines were broken and weren't picked up correctly by the hashing script.
BUG=
R=piman@chromium.org
Review URL: https://codereview.chromium.org/49113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231657 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_mac.mm | 4 | ||||
| -rw-r--r-- | content/browser/renderer_host/software_frame_manager.cc | 12 | ||||
| -rw-r--r-- | tools/metrics/actions/chromeactions.txt | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index d632390..71dfb16 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -1679,8 +1679,8 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( // Only software compositor frames are accepted. if (!frame->software_frame_data) { DLOG(ERROR) << "Received unexpected frame type."; - RecordAction(UserMetricsAction( - "BadMessageTerminate_UnexpectedFrameType")); + RecordAction( + UserMetricsAction("BadMessageTerminate_UnexpectedFrameType")); render_widget_host_->GetProcess()->ReceivedBadMessage(); return; } diff --git a/content/browser/renderer_host/software_frame_manager.cc b/content/browser/renderer_host/software_frame_manager.cc index 0650a18..b36c750 100644 --- a/content/browser/renderer_host/software_frame_manager.cc +++ b/content/browser/renderer_host/software_frame_manager.cc @@ -129,23 +129,23 @@ bool SoftwareFrameManager::SwapToNewFrame( if (!shared_memory->Map(0)) { DumpWithoutCrashing(); DLOG(ERROR) << "Unable to map renderer memory."; - RecordAction(UserMetricsAction( - "BadMessageTerminate_SharedMemoryManager1")); + RecordAction( + UserMetricsAction("BadMessageTerminate_SharedMemoryManager1")); return false; } if (shared_memory->mapped_size() < size_in_bytes) { DumpWithoutCrashing(); DLOG(ERROR) << "Shared memory too small for given rectangle"; - RecordAction(UserMetricsAction( - "BadMessageTerminate_SharedMemoryManager2")); + RecordAction( + UserMetricsAction("BadMessageTerminate_SharedMemoryManager2")); return false; } #else if (!shared_memory->Map(size_in_bytes)) { DLOG(ERROR) << "Unable to map renderer memory."; - RecordAction(UserMetricsAction( - "BadMessageTerminate_SharedMemoryManager1")); + RecordAction( + UserMetricsAction("BadMessageTerminate_SharedMemoryManager1")); return false; } #endif diff --git a/tools/metrics/actions/chromeactions.txt b/tools/metrics/actions/chromeactions.txt index f79fc45..866abd1 100644 --- a/tools/metrics/actions/chromeactions.txt +++ b/tools/metrics/actions/chromeactions.txt @@ -162,6 +162,9 @@ 0xefc9deffa33ee67d BadMessageTerminate_RWH5 0x5378a4f2a775cb88 BadMessageTerminate_RWHVA1 0x3ceaa56d35b39da4 BadMessageTerminate_RWHVA2 +0x2996df71030ce814 BadMessageTerminate_SharedMemoryManager1 +0xf0a271d3e39e7deb BadMessageTerminate_SharedMemoryManager2 +0xb22079c43bc5b72e BadMessageTerminate_UnexpectedFrameType 0xc4874f0e8e8b60aa BadMessageTerminate_WPH 0x56649dd19258ed1f BindingsMismatchTerminate_RVH_WebUI 0x85a700c6e9915ca8 BindingsMismatch_GetProcessHostPerSite |