chromium/src
0
Fork 0
Code Activity

Move FrameMsg_CheckCompleted to mojo

Browse Source 
CheckCompleted moves to mojo. There already is an implementation on
LocalFrame so this uses that same signature for implementation.

BUG=1008432

Change-Id: I23381f935f06290cebf0181bc6c6af462323ab28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1877130
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709937}
This commit is contained in:
Dave Tapuska
2019-10-28 16:52:57 +00:00
committed by Commit Bot
parent 06e00329b4
commit 28567cffcd
10 changed files with 8 additions and 19 deletions

2
content/browser/frame_host/render_frame_proxy_host.cc

@ -395,7 +395,7 @@ void RenderFrameProxyHost::OnOpenURL(
void RenderFrameProxyHost::OnCheckCompleted() {
RenderFrameHostImpl* target_rfh = frame_tree_node()->current_frame_host();
target_rfh->Send(new FrameMsg_CheckCompleted(target_rfh->GetRoutingID()));
target_rfh->GetAssociatedLocalFrame()->CheckCompleted();
}
void RenderFrameProxyHost::OnRouteMessageEvent(

4
content/common/frame_messages.h

@ -798,10 +798,6 @@ IPC_MESSAGE_ROUTED0(FrameMsg_SetFocusedFrame)
IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings,
FrameMsg_TextTrackSettings_Params /* params */)
// Sent to a frame when one of its remote children finishes loading, so that the
// frame can update its loading state.
IPC_MESSAGE_ROUTED0(FrameMsg_CheckCompleted)
// Tells the RenderFrame to clear the focused element (if any).
IPC_MESSAGE_ROUTED0(FrameMsg_ClearFocusedElement)

2
content/public/test/fake_local_frame.cc

@ -33,6 +33,8 @@ void FakeLocalFrame::AddMessageToConsole(
const std::string& message,
bool discard_duplicates) {}
void FakeLocalFrame::CheckCompleted() {}
void FakeLocalFrame::BindFrameHostReceiver(
mojo::ScopedInterfaceEndpointHandle handle) {
receiver_.Bind(mojo::PendingAssociatedReceiver<blink::mojom::LocalFrame>(

1
content/public/test/fake_local_frame.h

@ -32,6 +32,7 @@ class FakeLocalFrame : public blink::mojom::LocalFrame {
void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level,
const std::string& message,
bool discard_duplicates) override;
void CheckCompleted() override;
private:
void BindFrameHostReceiver(mojo::ScopedInterfaceEndpointHandle handle);

5
content/renderer/render_frame_impl.cc

@ -2278,7 +2278,6 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
OnTextTrackSettingsChanged)
IPC_MESSAGE_HANDLER(FrameMsg_CheckCompleted, OnCheckCompleted)
IPC_MESSAGE_HANDLER(FrameMsg_ReportContentSecurityPolicyViolation,
OnReportContentSecurityPolicyViolation)
IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
@ -2884,10 +2883,6 @@ void RenderFrameImpl::OnTextTrackSettingsChanged(
WebString::FromUTF8(params.text_track_text_size));
}
void RenderFrameImpl::OnCheckCompleted() {
frame_->CheckCompleted();
}
void RenderFrameImpl::PostMessageEvent(int32_t source_routing_id,
const base::string16& source_origin,
const base::string16& target_origin,

1
content/renderer/render_frame_impl.h

@ -1128,7 +1128,6 @@ class CONTENT_EXPORT RenderFrameImpl
void OnSetFocusedFrame();
void OnTextTrackSettingsChanged(
const FrameMsg_TextTrackSettings_Params& params);
void OnCheckCompleted();
void OnReportContentSecurityPolicyViolation(
const content::CSPViolationParams& violation_params);
void OnGetSavableResourceLinks();

4
third_party/blink/public/mojom/frame/frame.mojom vendored

@ -88,6 +88,10 @@ interface LocalFrame {
// Add message to the frame console.
AddMessageToConsole(ConsoleMessageLevel level, string message,
bool discard_duplicates);
// Sent to a frame when one of its remote children finishes loading, so that the
// frame can update its loading state.
CheckCompleted();
};
// Implemented in Blink, this interface defines frame-specific methods that will

3
third_party/blink/public/web/web_local_frame.h vendored

@ -643,9 +643,6 @@ class WebLocalFrame : public WebFrame {
virtual WebAssociatedURLLoader* CreateAssociatedURLLoader(
const WebAssociatedURLLoaderOptions&) = 0;
// Check whether loading has completed based on subframe state, etc.
virtual void CheckCompleted() = 0;
// Geometry -----------------------------------------------------------------
// NOTE: These routines do not force page layout so their results may

4
third_party/blink/renderer/core/frame/web_local_frame_impl.cc vendored

@ -927,10 +927,6 @@ void WebLocalFrameImpl::StartNavigation(const WebURLRequest& request) {
WebFrameLoadType::kStandard);
}
void WebLocalFrameImpl::CheckCompleted() {
GetFrame()->GetDocument()->CheckCompleted();
}
void WebLocalFrameImpl::StopLoading() {
if (!GetFrame())
return;

1
third_party/blink/renderer/core/frame/web_local_frame_impl.h vendored

@ -284,7 +284,6 @@ class CORE_EXPORT WebLocalFrameImpl final
WebInputMethodController* GetInputMethodController() override;
WebAssociatedURLLoader* CreateAssociatedURLLoader(
const WebAssociatedURLLoaderOptions&) override;
void CheckCompleted() override;
WebSize GetScrollOffset() const override;
void SetScrollOffset(const WebSize&) override;
WebSize DocumentSize() const override;