Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/frame_host/frame_tree_node_blame_context.h" | 5 #include "content/browser/frame_host/frame_tree_node_blame_context.h" |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/trace_event/trace_event_argument.h" | 8 #include "base/trace_event/trace_event_argument.h" |
| 9 #include "content/browser/frame_host/frame_tree.h" | 9 #include "content/browser/frame_host/frame_tree.h" |
| 10 #include "url/gurl.h" | 10 #include "url/gurl.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 // process handle and the render host still retains it. Therefore, we | 49 // process handle and the render host still retains it. Therefore, we |
| 50 // cannot create a base::Process object, which provides a proper way to get | 50 // cannot create a base::Process object, which provides a proper way to get |
| 51 // a process id, from the handle. For a stopgap, we use this deprecated | 51 // a process id, from the handle. For a stopgap, we use this deprecated |
| 52 // function that does not require the ownership (http://crbug.com/417532). | 52 // function that does not require the ownership (http://crbug.com/417532). |
| 53 int process_id = base::GetProcId( | 53 int process_id = base::GetProcId( |
| 54 current_frame_host->GetProcess()->GetHandle()); | 54 current_frame_host->GetProcess()->GetHandle()); |
| 55 if (process_id >= 0) { | 55 if (process_id >= 0) { |
| 56 int routing_id = current_frame_host->GetRoutingID(); | 56 int routing_id = current_frame_host->GetRoutingID(); |
| 57 DCHECK_NE(routing_id, MSG_ROUTING_NONE); | 57 DCHECK_NE(routing_id, MSG_ROUTING_NONE); |
| 58 | 58 |
| 59 value->BeginDictionary(kRenderFrameBlameContextScope); | 59 value->BeginDictionary("renderFrame"); |
|
Sami
2016/06/01 09:11:48
nit: render_frame to match the other properties he
| |
| 60 value->SetInteger("pid_ref", process_id); | 60 value->SetInteger("pid_ref", process_id); |
| 61 value->SetString("id_ref", base::StringPrintf("0x%x", routing_id)); | 61 value->SetString("id_ref", base::StringPrintf("0x%x", routing_id)); |
| 62 value->SetString("scope", kRenderFrameBlameContextScope); | 62 value->SetString("scope", kRenderFrameBlameContextScope); |
| 63 value->EndDictionary(); | 63 value->EndDictionary(); |
| 64 } | 64 } |
| 65 | 65 |
| 66 GURL url = current_frame_host->last_committed_url(); | 66 GURL url = current_frame_host->last_committed_url(); |
| 67 if (url.is_valid()) | 67 if (url.is_valid()) |
| 68 value->SetString("url", url.spec()); | 68 value->SetString("url", url.spec()); |
| 69 } | 69 } |
| 70 | 70 |
| 71 } // namespace content | 71 } // namespace content |
| OLD | NEW |