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_message_filter.h" | 5 #include "content/browser/renderer_host/render_message_filter.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
488 params.window_container_type, | 488 params.window_container_type, |
489 params.target_url, | 489 params.target_url, |
490 params.referrer, | 490 params.referrer, |
491 params.disposition, | 491 params.disposition, |
492 features, | 492 features, |
493 params.user_gesture, | 493 params.user_gesture, |
494 params.opener_suppressed, | 494 params.opener_suppressed, |
495 resource_context_, | 495 resource_context_, |
496 render_process_id_, | 496 render_process_id_, |
497 params.opener_id, | 497 params.opener_id, |
| 498 params.opener_render_frame_id, |
498 &no_javascript_access); | 499 &no_javascript_access); |
499 | 500 |
500 if (!can_create_window) { | 501 if (!can_create_window) { |
501 *route_id = MSG_ROUTING_NONE; | 502 *route_id = MSG_ROUTING_NONE; |
502 *main_frame_route_id = MSG_ROUTING_NONE; | 503 *main_frame_route_id = MSG_ROUTING_NONE; |
503 *surface_id = 0; | 504 *surface_id = 0; |
504 *cloned_session_storage_namespace_id = 0; | 505 *cloned_session_storage_namespace_id = 0; |
505 return; | 506 return; |
506 } | 507 } |
507 | 508 |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1221 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( | 1222 void RenderMessageFilter::OnDeletedGpuMemoryBuffer( |
1222 gfx::GpuMemoryBufferId id, | 1223 gfx::GpuMemoryBufferId id, |
1223 uint32 sync_point) { | 1224 uint32 sync_point) { |
1224 DCHECK(BrowserGpuMemoryBufferManager::current()); | 1225 DCHECK(BrowserGpuMemoryBufferManager::current()); |
1225 | 1226 |
1226 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( | 1227 BrowserGpuMemoryBufferManager::current()->ChildProcessDeletedGpuMemoryBuffer( |
1227 id, PeerHandle(), render_process_id_, sync_point); | 1228 id, PeerHandle(), render_process_id_, sync_point); |
1228 } | 1229 } |
1229 | 1230 |
1230 } // namespace content | 1231 } // namespace content |
OLD | NEW |