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 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
684 | 684 |
685 if (params.main_frame_routing_id != MSG_ROUTING_NONE) { | 685 if (params.main_frame_routing_id != MSG_ROUTING_NONE) { |
686 main_render_frame_ = RenderFrameImpl::CreateMainFrame( | 686 main_render_frame_ = RenderFrameImpl::CreateMainFrame( |
687 this, params.main_frame_routing_id, params.main_frame_widget_routing_id, | 687 this, params.main_frame_routing_id, params.main_frame_widget_routing_id, |
688 params.hidden, screen_info(), compositor_deps_); | 688 params.hidden, screen_info(), compositor_deps_); |
689 } | 689 } |
690 | 690 |
691 if (params.proxy_routing_id != MSG_ROUTING_NONE) { | 691 if (params.proxy_routing_id != MSG_ROUTING_NONE) { |
692 CHECK(params.swapped_out); | 692 CHECK(params.swapped_out); |
693 if (main_render_frame_) { | 693 if (main_render_frame_) { |
694 DCHECK(!SiteIsolationPolicy::IsSwappedOutStateForbidden()); | 694 CHECK(!SiteIsolationPolicy::IsSwappedOutStateForbidden()); |
Charlie Reis
2016/01/22 18:00:51
I suspect that we'll fail this check rather than c
| |
695 RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame( | 695 RenderFrameProxy* proxy = RenderFrameProxy::CreateProxyToReplaceFrame( |
696 main_render_frame_, params.proxy_routing_id, | 696 main_render_frame_, params.proxy_routing_id, |
697 blink::WebTreeScopeType::Document); | 697 blink::WebTreeScopeType::Document); |
698 main_render_frame_->set_render_frame_proxy(proxy); | 698 main_render_frame_->set_render_frame_proxy(proxy); |
699 } else { | 699 } else { |
700 DCHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); | 700 CHECK(SiteIsolationPolicy::IsSwappedOutStateForbidden()); |
701 // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be | 701 // Pass MSG_ROUTING_NONE for opener, since actual opener (if any) will be |
702 // set separately below. | 702 // set separately below. |
703 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id(), | 703 RenderFrameProxy::CreateFrameProxy(params.proxy_routing_id, routing_id(), |
704 MSG_ROUTING_NONE, MSG_ROUTING_NONE, | 704 MSG_ROUTING_NONE, MSG_ROUTING_NONE, |
705 params.replicated_frame_state); | 705 params.replicated_frame_state); |
706 } | 706 } |
707 } | 707 } |
708 | 708 |
709 if (main_render_frame_) | 709 if (main_render_frame_) |
710 main_render_frame_->Initialize(); | 710 main_render_frame_->Initialize(); |
(...skipping 3016 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3727 if (IsUseZoomForDSFEnabled()) { | 3727 if (IsUseZoomForDSFEnabled()) { |
3728 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); | 3728 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); |
3729 } else { | 3729 } else { |
3730 webview()->setDeviceScaleFactor(device_scale_factor_); | 3730 webview()->setDeviceScaleFactor(device_scale_factor_); |
3731 } | 3731 } |
3732 webview()->settings()->setPreferCompositingToLCDTextEnabled( | 3732 webview()->settings()->setPreferCompositingToLCDTextEnabled( |
3733 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); | 3733 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); |
3734 } | 3734 } |
3735 | 3735 |
3736 } // namespace content | 3736 } // namespace content |
OLD | NEW |