OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer_host/render_view_host_impl.h" | 5 #include "content/browser/renderer_host/render_view_host_impl.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
206 GetProcess()->EnableSendQueue(); | 206 GetProcess()->EnableSendQueue(); |
207 | 207 |
208 if (swapped_out) { | 208 if (swapped_out) { |
209 rvh_state_ = STATE_SWAPPED_OUT; | 209 rvh_state_ = STATE_SWAPPED_OUT; |
210 } else { | 210 } else { |
211 rvh_state_ = STATE_DEFAULT; | 211 rvh_state_ = STATE_DEFAULT; |
212 instance_->increment_active_view_count(); | 212 instance_->increment_active_view_count(); |
213 } | 213 } |
214 | 214 |
215 if (ResourceDispatcherHostImpl::Get()) { | 215 if (ResourceDispatcherHostImpl::Get()) { |
| 216 WebContentsImpl* content = static_cast<WebContentsImpl*>(widget_delegate); |
| 217 ResourceScheduler::VisualObserver* observer = |
| 218 ResourceDispatcherHostImpl::Get()->scheduler()->CreateVisualObserver( |
| 219 content); |
216 BrowserThread::PostTask( | 220 BrowserThread::PostTask( |
217 BrowserThread::IO, FROM_HERE, | 221 BrowserThread::IO, FROM_HERE, |
218 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, | 222 base::Bind(&ResourceDispatcherHostImpl::OnRenderViewHostCreated, |
219 base::Unretained(ResourceDispatcherHostImpl::Get()), | 223 base::Unretained(ResourceDispatcherHostImpl::Get()), |
220 GetProcess()->GetID(), GetRoutingID())); | 224 GetProcess()->GetID(), |
| 225 GetRoutingID(), |
| 226 base::Unretained(observer), |
| 227 !content->IsHidden())); |
221 } | 228 } |
222 | 229 |
223 #if defined(ENABLE_BROWSER_CDMS) | 230 #if defined(ENABLE_BROWSER_CDMS) |
224 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); | 231 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); |
225 #endif | 232 #endif |
226 | 233 |
227 unload_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( | 234 unload_event_monitor_timeout_.reset(new TimeoutMonitor(base::Bind( |
228 &RenderViewHostImpl::OnSwappedOut, weak_factory_.GetWeakPtr(), true))); | 235 &RenderViewHostImpl::OnSwappedOut, weak_factory_.GetWeakPtr(), true))); |
229 } | 236 } |
230 | 237 |
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1568 FrameTree* frame_tree = delegate_->GetFrameTree(); | 1575 FrameTree* frame_tree = delegate_->GetFrameTree(); |
1569 | 1576 |
1570 frame_tree->ResetForMainFrameSwap(); | 1577 frame_tree->ResetForMainFrameSwap(); |
1571 } | 1578 } |
1572 | 1579 |
1573 void RenderViewHostImpl::SelectWordAroundCaret() { | 1580 void RenderViewHostImpl::SelectWordAroundCaret() { |
1574 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); | 1581 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); |
1575 } | 1582 } |
1576 | 1583 |
1577 } // namespace content | 1584 } // namespace content |
OLD | NEW |