| 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/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2114 if (!gpu_channel_) | 2114 if (!gpu_channel_) |
| 2115 return nullptr; | 2115 return nullptr; |
| 2116 if (gpu_channel_->IsLost()) | 2116 if (gpu_channel_->IsLost()) |
| 2117 return nullptr; | 2117 return nullptr; |
| 2118 return gpu_channel_.get(); | 2118 return gpu_channel_.get(); |
| 2119 } | 2119 } |
| 2120 | 2120 |
| 2121 void RenderThreadImpl::CreateView(mojom::CreateViewParamsPtr params) { | 2121 void RenderThreadImpl::CreateView(mojom::CreateViewParamsPtr params) { |
| 2122 CompositorDependencies* compositor_deps = this; | 2122 CompositorDependencies* compositor_deps = this; |
| 2123 // When bringing in render_view, also bring in webkit's glue and jsbindings. | 2123 // When bringing in render_view, also bring in webkit's glue and jsbindings. |
| 2124 RenderViewImpl::Create(compositor_deps, *params, false); | 2124 RenderViewImpl::Create(compositor_deps, *params, |
| 2125 RenderWidget::ShowCallback()); |
| 2125 } | 2126 } |
| 2126 | 2127 |
| 2127 void RenderThreadImpl::CreateFrame(mojom::CreateFrameParamsPtr params) { | 2128 void RenderThreadImpl::CreateFrame(mojom::CreateFrameParamsPtr params) { |
| 2128 // Debug cases of https://crbug.com/626802. | 2129 // Debug cases of https://crbug.com/626802. |
| 2129 base::debug::SetCrashKeyValue("newframe_routing_id", | 2130 base::debug::SetCrashKeyValue("newframe_routing_id", |
| 2130 base::IntToString(params->routing_id)); | 2131 base::IntToString(params->routing_id)); |
| 2131 base::debug::SetCrashKeyValue("newframe_proxy_id", | 2132 base::debug::SetCrashKeyValue("newframe_proxy_id", |
| 2132 base::IntToString(params->proxy_routing_id)); | 2133 base::IntToString(params->proxy_routing_id)); |
| 2133 base::debug::SetCrashKeyValue("newframe_opener_id", | 2134 base::debug::SetCrashKeyValue("newframe_opener_id", |
| 2134 base::IntToString(params->opener_routing_id)); | 2135 base::IntToString(params->opener_routing_id)); |
| (...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2477 } | 2478 } |
| 2478 } | 2479 } |
| 2479 | 2480 |
| 2480 void RenderThreadImpl::OnRendererInterfaceRequest( | 2481 void RenderThreadImpl::OnRendererInterfaceRequest( |
| 2481 mojom::RendererAssociatedRequest request) { | 2482 mojom::RendererAssociatedRequest request) { |
| 2482 DCHECK(!renderer_binding_.is_bound()); | 2483 DCHECK(!renderer_binding_.is_bound()); |
| 2483 renderer_binding_.Bind(std::move(request)); | 2484 renderer_binding_.Bind(std::move(request)); |
| 2484 } | 2485 } |
| 2485 | 2486 |
| 2486 } // namespace content | 2487 } // namespace content |
| OLD | NEW |