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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1825 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1836 return NULL; | 1836 return NULL; |
1837 | 1837 |
1838 ViewHostMsg_CreateWindow_Params params; | 1838 ViewHostMsg_CreateWindow_Params params; |
1839 params.opener_id = routing_id_; | 1839 params.opener_id = routing_id_; |
1840 params.user_gesture = creator->isProcessingUserGesture(); | 1840 params.user_gesture = creator->isProcessingUserGesture(); |
1841 params.window_container_type = WindowFeaturesToContainerType(features); | 1841 params.window_container_type = WindowFeaturesToContainerType(features); |
1842 params.session_storage_namespace_id = session_storage_namespace_id_; | 1842 params.session_storage_namespace_id = session_storage_namespace_id_; |
1843 params.frame_name = frame_name; | 1843 params.frame_name = frame_name; |
1844 params.opener_frame_id = creator->identifier(); | 1844 params.opener_frame_id = creator->identifier(); |
1845 params.opener_url = creator->document().url(); | 1845 params.opener_url = creator->document().url(); |
1846 params.opener_security_origin = | 1846 GURL security_url(creator->document().securityOrigin().toString().utf8()); |
1847 creator->document().securityOrigin().toString().utf8(); | 1847 if (!security_url.is_valid()) |
| 1848 security_url = GURL(); |
| 1849 params.opener_security_origin = security_url; |
1848 params.opener_suppressed = creator->willSuppressOpenerInNewFrame(); | 1850 params.opener_suppressed = creator->willSuppressOpenerInNewFrame(); |
1849 params.disposition = NavigationPolicyToDisposition(policy); | 1851 params.disposition = NavigationPolicyToDisposition(policy); |
1850 if (!request.isNull()) | 1852 if (!request.isNull()) |
1851 params.target_url = request.url(); | 1853 params.target_url = request.url(); |
1852 | 1854 |
1853 int32 routing_id = MSG_ROUTING_NONE; | 1855 int32 routing_id = MSG_ROUTING_NONE; |
1854 int32 surface_id = 0; | 1856 int32 surface_id = 0; |
1855 int64 cloned_session_storage_namespace_id; | 1857 int64 cloned_session_storage_namespace_id; |
1856 | 1858 |
1857 RenderThread::Get()->Send( | 1859 RenderThread::Get()->Send( |
(...skipping 4739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6597 } | 6599 } |
6598 #endif | 6600 #endif |
6599 | 6601 |
6600 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( | 6602 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( |
6601 TransportDIB::Handle dib_handle) { | 6603 TransportDIB::Handle dib_handle) { |
6602 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6604 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6603 RenderProcess::current()->ReleaseTransportDIB(dib); | 6605 RenderProcess::current()->ReleaseTransportDIB(dib); |
6604 } | 6606 } |
6605 | 6607 |
6606 } // namespace content | 6608 } // namespace content |
OLD | NEW |