Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 571c2f9fecf70ce2eec1d463d9a6ddd75591046e..a68e4c626728ffa5aba3205936c27627acfdca14 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -1352,9 +1352,11 @@ RenderWidgetFullscreenPepper* RenderFrameImpl::CreatePepperFullscreenContainer( |
&fullscreen_widget_routing_id)) { |
return nullptr; |
} |
+ RenderWidget::ShowCallback show_callback = base::Bind( |
+ &RenderViewImpl::ShowCreatedFullscreenWidget, render_view()->AsWeakPtr()); |
RenderWidgetFullscreenPepper* widget = RenderWidgetFullscreenPepper::Create( |
- fullscreen_widget_routing_id, render_view()->routing_id(), |
+ fullscreen_widget_routing_id, show_callback, |
GetRenderWidget()->compositor_deps(), plugin, active_url, |
GetRenderWidget()->screen_info()); |
widget->show(blink::WebNavigationPolicyIgnore); |
lfg
2016/11/16 23:07:58
Do you need the callback here? show() is called im
ncarter (slow)
2016/11/16 23:14:08
That occurred to me too (though I'm looking at thi
lfg
2016/11/17 16:37:29
Acknowledged.
ncarter (slow)
2016/11/17 19:33:11
Comment added.
|
@@ -5114,11 +5116,13 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation( |
!pending_navigation_params_->request_params.redirects.empty()); |
#ifdef OS_ANDROID |
+ bool render_view_was_created_with_opener = |
+ render_view_->was_created_by_renderer_; |
// The handlenavigation API is deprecated and will be removed once |
// crbug.com/325351 is resolved. |
if (GetContentClient()->renderer()->HandleNavigation( |
- this, is_content_initiated, render_view_->opener_id_, frame_, |
- info.urlRequest, info.navigationType, info.defaultPolicy, |
+ this, is_content_initiated, render_view_was_created_with_opener, |
+ frame_, info.urlRequest, info.navigationType, info.defaultPolicy, |
is_redirect)) { |
return blink::WebNavigationPolicyIgnore; |
} |