| 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/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 if (params.proxy_routing_id != MSG_ROUTING_NONE) { | 698 if (params.proxy_routing_id != MSG_ROUTING_NONE) { |
| 699 CHECK(params.swapped_out); | 699 CHECK(params.swapped_out); |
| 700 if (main_render_frame_) { | 700 if (main_render_frame_) { |
| 701 DCHECK(!SiteIsolationPolicy::IsSwappedOutStateForbidden()); | 701 DCHECK(!SiteIsolationPolicy::IsSwappedOutStateForbidden()); |
| 702 RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame( | 702 RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
| 703 main_render_frame_, params.proxy_routing_id, | 703 main_render_frame_, params.proxy_routing_id, |
| 704 blink::WebTreeScopeType::Document); | 704 blink::WebTreeScopeType::Document); |
| 705 main_render_frame_->set_render_frame_proxy(proxy); | 705 main_render_frame_->set_render_frame_proxy(proxy); |
| 706 } else { | 706 } else { |
| 707 DCHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); | 707 DCHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); |
| 708 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, | 708 // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be |
| 709 MSG_ROUTING_NONE, routing_id_, | 709 // set separately below. |
| 710 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id_, |
| 711 MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
| 710 params.replicated_frame_state); | 712 params.replicated_frame_state); |
| 711 } | 713 } |
| 712 } | 714 } |
| 713 | 715 |
| 714 if (main_render_frame_) | 716 if (main_render_frame_) |
| 715 main_render_frame_->Initialize(); | 717 main_render_frame_->Initialize(); |
| 716 | 718 |
| 717 #if defined(OS_ANDROID) | 719 #if defined(OS_ANDROID) |
| 718 content_detectors_.push_back(linked_ptr<ContentDetector>( | 720 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 719 new AddressDetector())); | 721 new AddressDetector())); |
| (...skipping 3061 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3781 std::vector<gfx::Size> sizes; | 3783 std::vector<gfx::Size> sizes; |
| 3782 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3784 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3783 if (!url.isEmpty()) | 3785 if (!url.isEmpty()) |
| 3784 urls.push_back( | 3786 urls.push_back( |
| 3785 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3787 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3786 } | 3788 } |
| 3787 SendUpdateFaviconURL(urls); | 3789 SendUpdateFaviconURL(urls); |
| 3788 } | 3790 } |
| 3789 | 3791 |
| 3790 } // namespace content | 3792 } // namespace content |
| OLD | NEW |