| 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 "chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.h
" | 5 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber_service.h
" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" | 10 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 int main_render_process_id = -1; | 76 int main_render_process_id = -1; |
| 77 int main_render_frame_id = -1; | 77 int main_render_frame_id = -1; |
| 78 content::RenderFrameHost* main_frame = GetMainFrame(render_frame_host); | 78 content::RenderFrameHost* main_frame = GetMainFrame(render_frame_host); |
| 79 if (main_frame != render_frame_host) { | 79 if (main_frame != render_frame_host) { |
| 80 main_render_process_id = main_frame->GetProcess()->GetID(); | 80 main_render_process_id = main_frame->GetProcess()->GetID(); |
| 81 main_render_frame_id = main_frame->GetRoutingID(); | 81 main_render_frame_id = main_frame->GetRoutingID(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 content::BrowserThread::PostTask( | 84 content::BrowserThread::PostTask( |
| 85 content::BrowserThread::IO, FROM_HERE, | 85 content::BrowserThread::IO, FROM_HERE, |
| 86 base::Bind(&ChromeDataUseAscriber::RenderFrameCreated, | 86 base::BindOnce(&ChromeDataUseAscriber::RenderFrameCreated, |
| 87 base::Unretained(ascriber_), | 87 base::Unretained(ascriber_), |
| 88 render_frame_host->GetProcess()->GetID(), | 88 render_frame_host->GetProcess()->GetID(), |
| 89 render_frame_host->GetRoutingID(), main_render_process_id, | 89 render_frame_host->GetRoutingID(), main_render_process_id, |
| 90 main_render_frame_id)); | 90 main_render_frame_id)); |
| 91 } | 91 } |
| 92 | 92 |
| 93 void ChromeDataUseAscriberService::RenderFrameDeleted( | 93 void ChromeDataUseAscriberService::RenderFrameDeleted( |
| 94 content::RenderFrameHost* render_frame_host) { | 94 content::RenderFrameHost* render_frame_host) { |
| 95 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 95 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 96 | 96 |
| 97 if (!is_initialized_) { | 97 if (!is_initialized_) { |
| 98 // While remove() is a O(n) operation, the pending queue is not expected | 98 // While remove() is a O(n) operation, the pending queue is not expected |
| 99 // to have a significant number of elements. | 99 // to have a significant number of elements. |
| 100 DCHECK_GE(50u, pending_frames_queue_.size()); | 100 DCHECK_GE(50u, pending_frames_queue_.size()); |
| 101 pending_frames_queue_.remove(render_frame_host); | 101 pending_frames_queue_.remove(render_frame_host); |
| 102 return; | 102 return; |
| 103 } | 103 } |
| 104 | 104 |
| 105 if (!ascriber_) | 105 if (!ascriber_) |
| 106 return; | 106 return; |
| 107 | 107 |
| 108 int main_render_process_id = -1; | 108 int main_render_process_id = -1; |
| 109 int main_render_frame_id = -1; | 109 int main_render_frame_id = -1; |
| 110 content::RenderFrameHost* main_frame = GetMainFrame(render_frame_host); | 110 content::RenderFrameHost* main_frame = GetMainFrame(render_frame_host); |
| 111 if (main_frame != render_frame_host) { | 111 if (main_frame != render_frame_host) { |
| 112 main_render_process_id = main_frame->GetProcess()->GetID(); | 112 main_render_process_id = main_frame->GetProcess()->GetID(); |
| 113 main_render_frame_id = main_frame->GetRoutingID(); | 113 main_render_frame_id = main_frame->GetRoutingID(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 content::BrowserThread::PostTask( | 116 content::BrowserThread::PostTask( |
| 117 content::BrowserThread::IO, FROM_HERE, | 117 content::BrowserThread::IO, FROM_HERE, |
| 118 base::Bind(&ChromeDataUseAscriber::RenderFrameDeleted, | 118 base::BindOnce(&ChromeDataUseAscriber::RenderFrameDeleted, |
| 119 base::Unretained(ascriber_), | 119 base::Unretained(ascriber_), |
| 120 render_frame_host->GetProcess()->GetID(), | 120 render_frame_host->GetProcess()->GetID(), |
| 121 render_frame_host->GetRoutingID(), main_render_process_id, | 121 render_frame_host->GetRoutingID(), main_render_process_id, |
| 122 main_render_frame_id)); | 122 main_render_frame_id)); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void ChromeDataUseAscriberService::DidStartNavigation( | 125 void ChromeDataUseAscriberService::DidStartNavigation( |
| 126 content::NavigationHandle* navigation_handle) { | 126 content::NavigationHandle* navigation_handle) { |
| 127 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 127 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 128 if (!navigation_handle->IsInMainFrame()) | 128 if (!navigation_handle->IsInMainFrame()) |
| 129 return; | 129 return; |
| 130 | 130 |
| 131 if (!ascriber_) | 131 if (!ascriber_) |
| 132 return; | 132 return; |
| 133 content::WebContents* web_contents = navigation_handle->GetWebContents(); | 133 content::WebContents* web_contents = navigation_handle->GetWebContents(); |
| 134 content::BrowserThread::PostTask( | 134 content::BrowserThread::PostTask( |
| 135 content::BrowserThread::IO, FROM_HERE, | 135 content::BrowserThread::IO, FROM_HERE, |
| 136 base::Bind(&ChromeDataUseAscriber::DidStartMainFrameNavigation, | 136 base::BindOnce(&ChromeDataUseAscriber::DidStartMainFrameNavigation, |
| 137 base::Unretained(ascriber_), navigation_handle->GetURL(), | 137 base::Unretained(ascriber_), navigation_handle->GetURL(), |
| 138 web_contents->GetRenderProcessHost()->GetID(), | 138 web_contents->GetRenderProcessHost()->GetID(), |
| 139 web_contents->GetMainFrame()->GetRoutingID(), | 139 web_contents->GetMainFrame()->GetRoutingID(), |
| 140 navigation_handle)); | 140 navigation_handle)); |
| 141 } | 141 } |
| 142 | 142 |
| 143 void ChromeDataUseAscriberService::ReadyToCommitNavigation( | 143 void ChromeDataUseAscriberService::ReadyToCommitNavigation( |
| 144 content::NavigationHandle* navigation_handle) { | 144 content::NavigationHandle* navigation_handle) { |
| 145 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 145 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 146 | 146 |
| 147 if (!navigation_handle->IsInMainFrame()) | 147 if (!navigation_handle->IsInMainFrame()) |
| 148 return; | 148 return; |
| 149 | 149 |
| 150 if (!ascriber_) | 150 if (!ascriber_) |
| 151 return; | 151 return; |
| 152 | 152 |
| 153 content::WebContents* web_contents = navigation_handle->GetWebContents(); | 153 content::WebContents* web_contents = navigation_handle->GetWebContents(); |
| 154 content::BrowserThread::PostTask( | 154 content::BrowserThread::PostTask( |
| 155 content::BrowserThread::IO, FROM_HERE, | 155 content::BrowserThread::IO, FROM_HERE, |
| 156 base::Bind(&ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation, | 156 base::BindOnce(&ChromeDataUseAscriber::ReadyToCommitMainFrameNavigation, |
| 157 base::Unretained(ascriber_), navigation_handle->GetURL(), | 157 base::Unretained(ascriber_), navigation_handle->GetURL(), |
| 158 navigation_handle->GetGlobalRequestID(), | 158 navigation_handle->GetGlobalRequestID(), |
| 159 web_contents->GetRenderProcessHost()->GetID(), | 159 web_contents->GetRenderProcessHost()->GetID(), |
| 160 web_contents->GetMainFrame()->GetRoutingID(), | 160 web_contents->GetMainFrame()->GetRoutingID(), |
| 161 !navigation_handle->HasCommitted() || | 161 !navigation_handle->HasCommitted() || |
| 162 navigation_handle->IsSameDocument(), | 162 navigation_handle->IsSameDocument(), |
| 163 navigation_handle)); | 163 navigation_handle)); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void ChromeDataUseAscriberService::DidFinishNavigation( | 166 void ChromeDataUseAscriberService::DidFinishNavigation( |
| 167 content::NavigationHandle* navigation_handle) { | 167 content::NavigationHandle* navigation_handle) { |
| 168 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 168 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 169 | 169 |
| 170 if (!navigation_handle->IsInMainFrame() || | 170 if (!navigation_handle->IsInMainFrame() || |
| 171 !navigation_handle->HasCommitted() || navigation_handle->IsSameDocument()) | 171 !navigation_handle->HasCommitted() || navigation_handle->IsSameDocument()) |
| 172 return; | 172 return; |
| 173 | 173 |
| 174 if (!ascriber_) | 174 if (!ascriber_) |
| 175 return; | 175 return; |
| 176 | 176 |
| 177 content::WebContents* web_contents = navigation_handle->GetWebContents(); | 177 content::WebContents* web_contents = navigation_handle->GetWebContents(); |
| 178 content::BrowserThread::PostTask( | 178 content::BrowserThread::PostTask( |
| 179 content::BrowserThread::IO, FROM_HERE, | 179 content::BrowserThread::IO, FROM_HERE, |
| 180 base::Bind(&ChromeDataUseAscriber::DidFinishNavigation, | 180 base::BindOnce(&ChromeDataUseAscriber::DidFinishNavigation, |
| 181 base::Unretained(ascriber_), | 181 base::Unretained(ascriber_), |
| 182 web_contents->GetRenderProcessHost()->GetID(), | 182 web_contents->GetRenderProcessHost()->GetID(), |
| 183 web_contents->GetMainFrame()->GetRoutingID(), | 183 web_contents->GetMainFrame()->GetRoutingID(), |
| 184 navigation_handle->GetPageTransition())); | 184 navigation_handle->GetPageTransition())); |
| 185 } | 185 } |
| 186 | 186 |
| 187 void ChromeDataUseAscriberService::SetDataUseAscriber( | 187 void ChromeDataUseAscriberService::SetDataUseAscriber( |
| 188 ChromeDataUseAscriber* ascriber) { | 188 ChromeDataUseAscriber* ascriber) { |
| 189 DCHECK(!is_initialized_); | 189 DCHECK(!is_initialized_); |
| 190 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 190 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 191 | 191 |
| 192 ascriber_ = ascriber; | 192 ascriber_ = ascriber; |
| 193 is_initialized_ = true; | 193 is_initialized_ = true; |
| 194 | 194 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 211 if (!ascriber_) { | 211 if (!ascriber_) { |
| 212 if (visible) | 212 if (visible) |
| 213 pending_visible_main_frames_.insert(main_render_frame_host); | 213 pending_visible_main_frames_.insert(main_render_frame_host); |
| 214 else | 214 else |
| 215 pending_visible_main_frames_.erase(main_render_frame_host); | 215 pending_visible_main_frames_.erase(main_render_frame_host); |
| 216 return; | 216 return; |
| 217 } | 217 } |
| 218 | 218 |
| 219 content::BrowserThread::PostTask( | 219 content::BrowserThread::PostTask( |
| 220 content::BrowserThread::IO, FROM_HERE, | 220 content::BrowserThread::IO, FROM_HERE, |
| 221 base::Bind(&ChromeDataUseAscriber::WasShownOrHidden, | 221 base::BindOnce(&ChromeDataUseAscriber::WasShownOrHidden, |
| 222 base::Unretained(ascriber_), | 222 base::Unretained(ascriber_), |
| 223 main_render_frame_host->GetProcess()->GetID(), | 223 main_render_frame_host->GetProcess()->GetID(), |
| 224 main_render_frame_host->GetRoutingID(), visible)); | 224 main_render_frame_host->GetRoutingID(), visible)); |
| 225 } | 225 } |
| 226 | 226 |
| 227 void ChromeDataUseAscriberService::RenderFrameHostChanged( | 227 void ChromeDataUseAscriberService::RenderFrameHostChanged( |
| 228 content::RenderFrameHost* old_host, | 228 content::RenderFrameHost* old_host, |
| 229 content::RenderFrameHost* new_host) { | 229 content::RenderFrameHost* new_host) { |
| 230 if (!ascriber_) | 230 if (!ascriber_) |
| 231 return; | 231 return; |
| 232 | 232 |
| 233 if (old_host) { | 233 if (old_host) { |
| 234 content::BrowserThread::PostTask( | 234 content::BrowserThread::PostTask( |
| 235 content::BrowserThread::IO, FROM_HERE, | 235 content::BrowserThread::IO, FROM_HERE, |
| 236 base::Bind(&ChromeDataUseAscriber::RenderFrameHostChanged, | 236 base::BindOnce( |
| 237 base::Unretained(ascriber_), old_host->GetProcess()->GetID(), | 237 &ChromeDataUseAscriber::RenderFrameHostChanged, |
| 238 old_host->GetRoutingID(), new_host->GetProcess()->GetID(), | 238 base::Unretained(ascriber_), old_host->GetProcess()->GetID(), |
| 239 new_host->GetRoutingID())); | 239 old_host->GetRoutingID(), new_host->GetProcess()->GetID(), |
| 240 new_host->GetRoutingID())); |
| 240 } | 241 } |
| 241 } | 242 } |
| 242 | 243 |
| 243 } // namespace data_use_measurement | 244 } // namespace data_use_measurement |
| OLD | NEW |