Move FrameMsg_CheckCompleted to mojo
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:
content
browser
frame_host
common
public
renderer
third_party/blink
public
renderer
@ -395,7 +395,7 @@ void RenderFrameProxyHost::OnOpenURL(
|
|||||||
|
|
||||||
void RenderFrameProxyHost::OnCheckCompleted() {
|
void RenderFrameProxyHost::OnCheckCompleted() {
|
||||||
RenderFrameHostImpl* target_rfh = frame_tree_node()->current_frame_host();
|
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(
|
void RenderFrameProxyHost::OnRouteMessageEvent(
|
||||||
|
@ -798,10 +798,6 @@ IPC_MESSAGE_ROUTED0(FrameMsg_SetFocusedFrame)
|
|||||||
IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings,
|
IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings,
|
||||||
FrameMsg_TextTrackSettings_Params /* params */)
|
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).
|
// Tells the RenderFrame to clear the focused element (if any).
|
||||||
IPC_MESSAGE_ROUTED0(FrameMsg_ClearFocusedElement)
|
IPC_MESSAGE_ROUTED0(FrameMsg_ClearFocusedElement)
|
||||||
|
|
||||||
|
@ -33,6 +33,8 @@ void FakeLocalFrame::AddMessageToConsole(
|
|||||||
const std::string& message,
|
const std::string& message,
|
||||||
bool discard_duplicates) {}
|
bool discard_duplicates) {}
|
||||||
|
|
||||||
|
void FakeLocalFrame::CheckCompleted() {}
|
||||||
|
|
||||||
void FakeLocalFrame::BindFrameHostReceiver(
|
void FakeLocalFrame::BindFrameHostReceiver(
|
||||||
mojo::ScopedInterfaceEndpointHandle handle) {
|
mojo::ScopedInterfaceEndpointHandle handle) {
|
||||||
receiver_.Bind(mojo::PendingAssociatedReceiver<blink::mojom::LocalFrame>(
|
receiver_.Bind(mojo::PendingAssociatedReceiver<blink::mojom::LocalFrame>(
|
||||||
|
@ -32,6 +32,7 @@ class FakeLocalFrame : public blink::mojom::LocalFrame {
|
|||||||
void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level,
|
void AddMessageToConsole(blink::mojom::ConsoleMessageLevel level,
|
||||||
const std::string& message,
|
const std::string& message,
|
||||||
bool discard_duplicates) override;
|
bool discard_duplicates) override;
|
||||||
|
void CheckCompleted() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void BindFrameHostReceiver(mojo::ScopedInterfaceEndpointHandle handle);
|
void BindFrameHostReceiver(mojo::ScopedInterfaceEndpointHandle handle);
|
||||||
|
@ -2278,7 +2278,6 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
|
|||||||
IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
|
IPC_MESSAGE_HANDLER(FrameMsg_SetFocusedFrame, OnSetFocusedFrame)
|
||||||
IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
|
IPC_MESSAGE_HANDLER(FrameMsg_SetTextTrackSettings,
|
||||||
OnTextTrackSettingsChanged)
|
OnTextTrackSettingsChanged)
|
||||||
IPC_MESSAGE_HANDLER(FrameMsg_CheckCompleted, OnCheckCompleted)
|
|
||||||
IPC_MESSAGE_HANDLER(FrameMsg_ReportContentSecurityPolicyViolation,
|
IPC_MESSAGE_HANDLER(FrameMsg_ReportContentSecurityPolicyViolation,
|
||||||
OnReportContentSecurityPolicyViolation)
|
OnReportContentSecurityPolicyViolation)
|
||||||
IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
|
IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
|
||||||
@ -2884,10 +2883,6 @@ void RenderFrameImpl::OnTextTrackSettingsChanged(
|
|||||||
WebString::FromUTF8(params.text_track_text_size));
|
WebString::FromUTF8(params.text_track_text_size));
|
||||||
}
|
}
|
||||||
|
|
||||||
void RenderFrameImpl::OnCheckCompleted() {
|
|
||||||
frame_->CheckCompleted();
|
|
||||||
}
|
|
||||||
|
|
||||||
void RenderFrameImpl::PostMessageEvent(int32_t source_routing_id,
|
void RenderFrameImpl::PostMessageEvent(int32_t source_routing_id,
|
||||||
const base::string16& source_origin,
|
const base::string16& source_origin,
|
||||||
const base::string16& target_origin,
|
const base::string16& target_origin,
|
||||||
|
@ -1128,7 +1128,6 @@ class CONTENT_EXPORT RenderFrameImpl
|
|||||||
void OnSetFocusedFrame();
|
void OnSetFocusedFrame();
|
||||||
void OnTextTrackSettingsChanged(
|
void OnTextTrackSettingsChanged(
|
||||||
const FrameMsg_TextTrackSettings_Params& params);
|
const FrameMsg_TextTrackSettings_Params& params);
|
||||||
void OnCheckCompleted();
|
|
||||||
void OnReportContentSecurityPolicyViolation(
|
void OnReportContentSecurityPolicyViolation(
|
||||||
const content::CSPViolationParams& violation_params);
|
const content::CSPViolationParams& violation_params);
|
||||||
void OnGetSavableResourceLinks();
|
void OnGetSavableResourceLinks();
|
||||||
|
@ -88,6 +88,10 @@ interface LocalFrame {
|
|||||||
// Add message to the frame console.
|
// Add message to the frame console.
|
||||||
AddMessageToConsole(ConsoleMessageLevel level, string message,
|
AddMessageToConsole(ConsoleMessageLevel level, string message,
|
||||||
bool discard_duplicates);
|
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
|
// Implemented in Blink, this interface defines frame-specific methods that will
|
||||||
|
@ -643,9 +643,6 @@ class WebLocalFrame : public WebFrame {
|
|||||||
virtual WebAssociatedURLLoader* CreateAssociatedURLLoader(
|
virtual WebAssociatedURLLoader* CreateAssociatedURLLoader(
|
||||||
const WebAssociatedURLLoaderOptions&) = 0;
|
const WebAssociatedURLLoaderOptions&) = 0;
|
||||||
|
|
||||||
// Check whether loading has completed based on subframe state, etc.
|
|
||||||
virtual void CheckCompleted() = 0;
|
|
||||||
|
|
||||||
// Geometry -----------------------------------------------------------------
|
// Geometry -----------------------------------------------------------------
|
||||||
|
|
||||||
// NOTE: These routines do not force page layout so their results may
|
// NOTE: These routines do not force page layout so their results may
|
||||||
|
@ -927,10 +927,6 @@ void WebLocalFrameImpl::StartNavigation(const WebURLRequest& request) {
|
|||||||
WebFrameLoadType::kStandard);
|
WebFrameLoadType::kStandard);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WebLocalFrameImpl::CheckCompleted() {
|
|
||||||
GetFrame()->GetDocument()->CheckCompleted();
|
|
||||||
}
|
|
||||||
|
|
||||||
void WebLocalFrameImpl::StopLoading() {
|
void WebLocalFrameImpl::StopLoading() {
|
||||||
if (!GetFrame())
|
if (!GetFrame())
|
||||||
return;
|
return;
|
||||||
|
@ -284,7 +284,6 @@ class CORE_EXPORT WebLocalFrameImpl final
|
|||||||
WebInputMethodController* GetInputMethodController() override;
|
WebInputMethodController* GetInputMethodController() override;
|
||||||
WebAssociatedURLLoader* CreateAssociatedURLLoader(
|
WebAssociatedURLLoader* CreateAssociatedURLLoader(
|
||||||
const WebAssociatedURLLoaderOptions&) override;
|
const WebAssociatedURLLoaderOptions&) override;
|
||||||
void CheckCompleted() override;
|
|
||||||
WebSize GetScrollOffset() const override;
|
WebSize GetScrollOffset() const override;
|
||||||
void SetScrollOffset(const WebSize&) override;
|
void SetScrollOffset(const WebSize&) override;
|
||||||
WebSize DocumentSize() const override;
|
WebSize DocumentSize() const override;
|
||||||
|
Reference in New Issue
Block a user