| 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 1140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1151 | 1151 |
| 1152 void RenderThreadImpl::RegisterPendingFrameCreate( | 1152 void RenderThreadImpl::RegisterPendingFrameCreate( |
| 1153 int routing_id, | 1153 int routing_id, |
| 1154 mojom::FrameRequest frame_request, | 1154 mojom::FrameRequest frame_request, |
| 1155 mojom::FrameHostPtr frame_host) { | 1155 mojom::FrameHostPtr frame_host) { |
| 1156 std::pair<PendingFrameCreateMap::iterator, bool> result = | 1156 std::pair<PendingFrameCreateMap::iterator, bool> result = |
| 1157 pending_frame_creates_.insert(std::make_pair( | 1157 pending_frame_creates_.insert(std::make_pair( |
| 1158 routing_id, | 1158 routing_id, |
| 1159 make_scoped_refptr(new PendingFrameCreate( | 1159 make_scoped_refptr(new PendingFrameCreate( |
| 1160 routing_id, std::move(frame_request), std::move(frame_host))))); | 1160 routing_id, std::move(frame_request), std::move(frame_host))))); |
| 1161 CHECK(result.second) << "Inserting a duplicate item."; | 1161 // Inserting a duplicate item. |
| 1162 CHECK(result.second); |
| 1162 } | 1163 } |
| 1163 | 1164 |
| 1164 mojom::StoragePartitionService* RenderThreadImpl::GetStoragePartitionService() { | 1165 mojom::StoragePartitionService* RenderThreadImpl::GetStoragePartitionService() { |
| 1165 return storage_partition_service_.get(); | 1166 return storage_partition_service_.get(); |
| 1166 } | 1167 } |
| 1167 | 1168 |
| 1168 int RenderThreadImpl::GenerateRoutingID() { | 1169 int RenderThreadImpl::GenerateRoutingID() { |
| 1169 int32_t routing_id = MSG_ROUTING_NONE; | 1170 int32_t routing_id = MSG_ROUTING_NONE; |
| 1170 render_message_filter()->GenerateRoutingID(&routing_id); | 1171 render_message_filter()->GenerateRoutingID(&routing_id); |
| 1171 return routing_id; | 1172 return routing_id; |
| (...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2517 } | 2518 } |
| 2518 } | 2519 } |
| 2519 | 2520 |
| 2520 void RenderThreadImpl::OnRendererInterfaceRequest( | 2521 void RenderThreadImpl::OnRendererInterfaceRequest( |
| 2521 mojom::RendererAssociatedRequest request) { | 2522 mojom::RendererAssociatedRequest request) { |
| 2522 DCHECK(!renderer_binding_.is_bound()); | 2523 DCHECK(!renderer_binding_.is_bound()); |
| 2523 renderer_binding_.Bind(std::move(request)); | 2524 renderer_binding_.Bind(std::move(request)); |
| 2524 } | 2525 } |
| 2525 | 2526 |
| 2526 } // namespace content | 2527 } // namespace content |
| OLD | NEW |