Commit 6a86bd21 authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Convert FrameMsg_SetNeedsOcclusionTracking to blink mojom RemoteFrame

BUG=104106
R=dcheng@chromium.org, dtapuska@chromium.org, haraken@chromium.org

Change-Id: Ib778b3cdb059dd5079f3b9e7ec61af1bb5107cdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002750Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#732342}
parent b5cdcd7a
...@@ -3540,8 +3540,7 @@ void RenderFrameHostImpl::SetNeedsOcclusionTracking(bool needs_tracking) { ...@@ -3540,8 +3540,7 @@ void RenderFrameHostImpl::SetNeedsOcclusionTracking(bool needs_tracking) {
return; return;
} }
proxy->Send(new FrameMsg_SetNeedsOcclusionTracking(proxy->GetRoutingID(), proxy->GetAssociatedRemoteFrame()->SetNeedsOcclusionTracking(needs_tracking);
needs_tracking));
} }
void RenderFrameHostImpl::LifecycleStateChanged( void RenderFrameHostImpl::LifecycleStateChanged(
......
...@@ -838,11 +838,6 @@ IPC_MESSAGE_ROUTED2(FrameMsg_SetPepperVolume, ...@@ -838,11 +838,6 @@ IPC_MESSAGE_ROUTED2(FrameMsg_SetPepperVolume,
double /* volume */) double /* volume */)
#endif // BUILDFLAG(ENABLE_PLUGINS) #endif // BUILDFLAG(ENABLE_PLUGINS)
// Notifies a parent frame that the child frame requires information about
// whether it is occluded or has visual effects applied.
IPC_MESSAGE_ROUTED1(FrameMsg_SetNeedsOcclusionTracking,
bool /* needs_tracking */)
// Tells the frame to update the user activation state in appropriate part of // Tells the frame to update the user activation state in appropriate part of
// the frame tree (ancestors for activation notification and all nodes for // the frame tree (ancestors for activation notification and all nodes for
// consumption). // consumption).
......
...@@ -423,8 +423,6 @@ bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) { ...@@ -423,8 +423,6 @@ bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
OnDidSetFramePolicyHeaders) OnDidSetFramePolicyHeaders)
IPC_MESSAGE_HANDLER(FrameMsg_ForwardResourceTimingToParent, IPC_MESSAGE_HANDLER(FrameMsg_ForwardResourceTimingToParent,
OnForwardResourceTimingToParent) OnForwardResourceTimingToParent)
IPC_MESSAGE_HANDLER(FrameMsg_SetNeedsOcclusionTracking,
OnSetNeedsOcclusionTracking)
IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName) IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateName, OnDidUpdateName)
IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy, IPC_MESSAGE_HANDLER(FrameMsg_EnforceInsecureRequestPolicy,
OnEnforceInsecureRequestPolicy) OnEnforceInsecureRequestPolicy)
...@@ -499,10 +497,6 @@ void RenderFrameProxy::OnForwardResourceTimingToParent( ...@@ -499,10 +497,6 @@ void RenderFrameProxy::OnForwardResourceTimingToParent(
ResourceTimingInfoToWebResourceTimingInfo(info)); ResourceTimingInfoToWebResourceTimingInfo(info));
} }
void RenderFrameProxy::OnSetNeedsOcclusionTracking(bool needs_tracking) {
web_frame_->SetNeedsOcclusionTracking(needs_tracking);
}
void RenderFrameProxy::OnDidUpdateName(const std::string& name, void RenderFrameProxy::OnDidUpdateName(const std::string& name,
const std::string& unique_name) { const std::string& unique_name) {
web_frame_->SetReplicatedName(blink::WebString::FromUTF8(name)); web_frame_->SetReplicatedName(blink::WebString::FromUTF8(name));
......
...@@ -238,7 +238,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener, ...@@ -238,7 +238,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
blink::ParsedFeaturePolicy parsed_feature_policy); blink::ParsedFeaturePolicy parsed_feature_policy);
void OnForwardResourceTimingToParent( void OnForwardResourceTimingToParent(
const ResourceTimingInfo& resource_timing); const ResourceTimingInfo& resource_timing);
void OnSetNeedsOcclusionTracking(bool);
void OnDidUpdateName(const std::string& name, const std::string& unique_name); void OnDidUpdateName(const std::string& name, const std::string& unique_name);
void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy); void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties); void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties);
......
...@@ -255,6 +255,11 @@ interface RemoteFrame { ...@@ -255,6 +255,11 @@ interface RemoteFrame {
// (eg. the iframe, portal, or object element). // (eg. the iframe, portal, or object element).
DispatchLoadEventForFrameOwner(); DispatchLoadEventForFrameOwner();
// Sent to the remote frame placeholder in the parent process to indicate the
// associated frame in the child process requires information about
// whether it is occluded or has visual effects applied.
SetNeedsOcclusionTracking(bool needs_tracking);
// Sent to the process that owns this frame's HTMLFrameOwnerElement to // Sent to the process that owns this frame's HTMLFrameOwnerElement to
// control whether the element is collapsed or not. If the element is // control whether the element is collapsed or not. If the element is
// collapsed, it will be removed from the layout tree of its parent // collapsed, it will be removed from the layout tree of its parent
......
...@@ -128,8 +128,6 @@ class WebRemoteFrame : public WebFrame { ...@@ -128,8 +128,6 @@ class WebRemoteFrame : public WebFrame {
// Reports resource timing info for a navigation in this frame. // Reports resource timing info for a navigation in this frame.
virtual void ForwardResourceTimingToParent(const WebResourceTimingInfo&) = 0; virtual void ForwardResourceTimingToParent(const WebResourceTimingInfo&) = 0;
virtual void SetNeedsOcclusionTracking(bool) = 0;
virtual void DidStartLoading() = 0; virtual void DidStartLoading() = 0;
virtual void DidStopLoading() = 0; virtual void DidStopLoading() = 0;
......
...@@ -319,10 +319,6 @@ void WebRemoteFrameImpl::ForwardResourceTimingToParent( ...@@ -319,10 +319,6 @@ void WebRemoteFrameImpl::ForwardResourceTimingToParent(
mojo::NullReceiver() /* worker_timing_receiver */); mojo::NullReceiver() /* worker_timing_receiver */);
} }
void WebRemoteFrameImpl::SetNeedsOcclusionTracking(bool needs_tracking) {
GetFrame()->View()->SetNeedsOcclusionTracking(needs_tracking);
}
void WebRemoteFrameImpl::DidStartLoading() { void WebRemoteFrameImpl::DidStartLoading() {
GetFrame()->SetIsLoading(true); GetFrame()->SetIsLoading(true);
} }
......
...@@ -91,7 +91,6 @@ class CORE_EXPORT WebRemoteFrameImpl final ...@@ -91,7 +91,6 @@ class CORE_EXPORT WebRemoteFrameImpl final
void SetReplicatedInsecureRequestPolicy(WebInsecureRequestPolicy) override; void SetReplicatedInsecureRequestPolicy(WebInsecureRequestPolicy) override;
void SetReplicatedInsecureNavigationsSet(const WebVector<unsigned>&) override; void SetReplicatedInsecureNavigationsSet(const WebVector<unsigned>&) override;
void ForwardResourceTimingToParent(const WebResourceTimingInfo&) override; void ForwardResourceTimingToParent(const WebResourceTimingInfo&) override;
void SetNeedsOcclusionTracking(bool) override;
void DidStartLoading() override; void DidStartLoading() override;
void DidStopLoading() override; void DidStopLoading() override;
bool IsIgnoredForHitTest() const override; bool IsIgnoredForHitTest() const override;
......
...@@ -361,6 +361,10 @@ void RemoteFrame::SetHadStickyUserActivationBeforeNavigation(bool value) { ...@@ -361,6 +361,10 @@ void RemoteFrame::SetHadStickyUserActivationBeforeNavigation(bool value) {
Frame::SetHadStickyUserActivationBeforeNavigation(value); Frame::SetHadStickyUserActivationBeforeNavigation(value);
} }
void RemoteFrame::SetNeedsOcclusionTracking(bool needs_tracking) {
View()->SetNeedsOcclusionTracking(needs_tracking);
}
void RemoteFrame::BubbleLogicalScroll( void RemoteFrame::BubbleLogicalScroll(
mojom::blink::ScrollDirection direction, mojom::blink::ScrollDirection direction,
ui::input_types::ScrollGranularity granularity) { ui::input_types::ScrollGranularity granularity) {
......
...@@ -103,6 +103,7 @@ class CORE_EXPORT RemoteFrame final : public Frame, ...@@ -103,6 +103,7 @@ class CORE_EXPORT RemoteFrame final : public Frame,
void Collapse(bool collapsed) final; void Collapse(bool collapsed) final;
void Focus() override; void Focus() override;
void SetHadStickyUserActivationBeforeNavigation(bool value) override; void SetHadStickyUserActivationBeforeNavigation(bool value) override;
void SetNeedsOcclusionTracking(bool needs_tracking) override;
void BubbleLogicalScroll( void BubbleLogicalScroll(
mojom::blink::ScrollDirection direction, mojom::blink::ScrollDirection direction,
ui::input_types::ScrollGranularity granularity) override; ui::input_types::ScrollGranularity granularity) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment