Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 7bad3ac99003f36b706679ee03097f9b74cb3bc2..474e8f4f5002680d31a858cec43c6f46f88eef07 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -1342,6 +1342,9 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(PageMsg_UpdateWindowScreenRect, |
OnUpdateWindowScreenRect) |
IPC_MESSAGE_HANDLER(PageMsg_SetZoomLevel, OnSetZoomLevel) |
+ IPC_MESSAGE_HANDLER(PageMsg_WasHidden, OnPageWasHidden) |
+ IPC_MESSAGE_HANDLER(PageMsg_WasShown, OnPageWasShown) |
+ |
#if defined(OS_ANDROID) |
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTopControlsState, |
OnUpdateTopControlsState) |
@@ -2314,10 +2317,6 @@ bool RenderViewImpl::GetContentStateImmediately() const { |
return send_content_state_immediately_; |
} |
-blink::WebPageVisibilityState RenderViewImpl::GetVisibilityState() const { |
- return visibilityState(); |
-} |
- |
void RenderViewImpl::DidStartLoading() { |
main_render_frame_->didStartLoading(true); |
} |
@@ -2781,9 +2780,7 @@ void RenderViewImpl::Close() { |
RenderThread::Get()->Send(new ViewHostMsg_Close_ACK(GetRoutingID())); |
} |
-void RenderViewImpl::OnWasHidden() { |
- RenderWidget::OnWasHidden(); |
- |
+void RenderViewImpl::OnPageWasHidden() { |
#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC) |
RenderThreadImpl::current()->video_capture_impl_manager()-> |
SuspendDevices(true); |
@@ -2791,21 +2788,30 @@ void RenderViewImpl::OnWasHidden() { |
speech_recognition_dispatcher_->AbortAllRecognitions(); |
#endif |
- if (webview()) |
- webview()->setVisibilityState(visibilityState(), false); |
+ if (webview()) { |
+ // TODO(lfg): It's not correct to defer the page visibility to the main |
+ // frame. Currently, this is done because the main frame may override the |
+ // visibility of the page when prerendering. In order to fix this, |
+ // prerendering must be made aware of OOPIFs. https://crbug.com/440544 |
+ blink::WebPageVisibilityState visibilityState = |
+ GetMainRenderFrame() ? GetMainRenderFrame()->visibilityState() |
+ : blink::WebPageVisibilityStateHidden; |
+ webview()->setVisibilityState(visibilityState, false); |
+ } |
} |
-void RenderViewImpl::OnWasShown(bool needs_repainting, |
- const ui::LatencyInfo& latency_info) { |
- RenderWidget::OnWasShown(needs_repainting, latency_info); |
- |
+void RenderViewImpl::OnPageWasShown() { |
#if defined(OS_ANDROID) && defined(ENABLE_WEBRTC) |
RenderThreadImpl::current()->video_capture_impl_manager()-> |
SuspendDevices(false); |
#endif |
- if (webview()) |
- webview()->setVisibilityState(visibilityState(), false); |
+ if (webview()) { |
+ blink::WebPageVisibilityState visibilityState = |
+ GetMainRenderFrame() ? GetMainRenderFrame()->visibilityState() |
+ : blink::WebPageVisibilityStateVisible; |
+ webview()->setVisibilityState(visibilityState, false); |
+ } |
} |
GURL RenderViewImpl::GetURLForGraphicsContext3D() { |
@@ -3082,16 +3088,10 @@ double RenderViewImpl::zoomFactorToZoomLevel(double factor) const { |
} |
blink::WebPageVisibilityState RenderViewImpl::visibilityState() const { |
- blink::WebPageVisibilityState current_state = is_hidden() ? |
- blink::WebPageVisibilityStateHidden : |
- blink::WebPageVisibilityStateVisible; |
- blink::WebPageVisibilityState override_state = current_state; |
- // TODO(jam): move this method to WebFrameClient. |
- if (GetContentClient()->renderer()-> |
- ShouldOverridePageVisibilityState(main_render_frame_, |
- &override_state)) |
- return override_state; |
- return current_state; |
+ // This method should only be used to determine initial visibility. |
dcheng
2016/06/03 21:22:52
Is there any chance we can just pass this value as
|
+ DCHECK(!main_render_frame_); |
+ return is_hidden() ? blink::WebPageVisibilityStateHidden |
+ : blink::WebPageVisibilityStateVisible; |
} |
void RenderViewImpl::draggableRegionsChanged() { |