| 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_widget_host_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 // if the value has changed. | 331 // if the value has changed. |
| 332 if (needs_begin_frames_) | 332 if (needs_begin_frames_) |
| 333 view_->SetNeedsBeginFrames(needs_begin_frames_); | 333 view_->SetNeedsBeginFrames(needs_begin_frames_); |
| 334 } else { | 334 } else { |
| 335 view_.reset(); | 335 view_.reset(); |
| 336 } | 336 } |
| 337 | 337 |
| 338 // If the renderer has not yet been initialized, then the surface ID | 338 // If the renderer has not yet been initialized, then the surface ID |
| 339 // namespace will be sent during initialization. | 339 // namespace will be sent during initialization. |
| 340 if (view_ && renderer_initialized_) { | 340 if (view_ && renderer_initialized_) { |
| 341 Send(new ViewMsg_SetSurfaceClientId(routing_id_, | 341 Send(new ViewMsg_SetFrameSinkId(routing_id_, view_->GetFrameSinkId())); |
| 342 view_->GetSurfaceClientId())); | |
| 343 } | 342 } |
| 344 | 343 |
| 345 synthetic_gesture_controller_.reset(); | 344 synthetic_gesture_controller_.reset(); |
| 346 } | 345 } |
| 347 | 346 |
| 348 RenderProcessHost* RenderWidgetHostImpl::GetProcess() const { | 347 RenderProcessHost* RenderWidgetHostImpl::GetProcess() const { |
| 349 return process_; | 348 return process_; |
| 350 } | 349 } |
| 351 | 350 |
| 352 int RenderWidgetHostImpl::GetRoutingID() const { | 351 int RenderWidgetHostImpl::GetRoutingID() const { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 } | 403 } |
| 405 | 404 |
| 406 void RenderWidgetHostImpl::Init() { | 405 void RenderWidgetHostImpl::Init() { |
| 407 DCHECK(process_->HasConnection()); | 406 DCHECK(process_->HasConnection()); |
| 408 | 407 |
| 409 renderer_initialized_ = true; | 408 renderer_initialized_ = true; |
| 410 | 409 |
| 411 // If the RWHV has not yet been set, the surface ID namespace will get | 410 // If the RWHV has not yet been set, the surface ID namespace will get |
| 412 // passed down by the call to SetView(). | 411 // passed down by the call to SetView(). |
| 413 if (view_) { | 412 if (view_) { |
| 414 Send(new ViewMsg_SetSurfaceClientId(routing_id_, | 413 Send(new ViewMsg_SetFrameSinkId(routing_id_, view_->GetFrameSinkId())); |
| 415 view_->GetSurfaceClientId())); | |
| 416 } | 414 } |
| 417 | 415 |
| 418 SendScreenRects(); | 416 SendScreenRects(); |
| 419 WasResized(); | 417 WasResized(); |
| 420 | 418 |
| 421 if (owner_delegate_) | 419 if (owner_delegate_) |
| 422 owner_delegate_->RenderWidgetDidInit(); | 420 owner_delegate_->RenderWidgetDidInit(); |
| 423 } | 421 } |
| 424 | 422 |
| 425 void RenderWidgetHostImpl::InitForFrame() { | 423 void RenderWidgetHostImpl::InitForFrame() { |
| (...skipping 1791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2217 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; | 2215 return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL; |
| 2218 } | 2216 } |
| 2219 | 2217 |
| 2220 BrowserAccessibilityManager* | 2218 BrowserAccessibilityManager* |
| 2221 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { | 2219 RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() { |
| 2222 return delegate_ ? | 2220 return delegate_ ? |
| 2223 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; | 2221 delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL; |
| 2224 } | 2222 } |
| 2225 | 2223 |
| 2226 } // namespace content | 2224 } // namespace content |
| OLD | NEW |