Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 954793002: Make load events in iframe elements work with OOPIF (Chromium side). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename DispatchFrameOwnerLoadEvent to DispatchLoadEventForFrameOwner Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/frame_with_load_event.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a0e63e38b01b243425dc0d84c684cd7ba423fe18..eb58a802d97919101e834ef0ceca038063539b94 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1009,6 +1009,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(FrameMsg_SetAccessibilityMode,
OnSetAccessibilityMode)
IPC_MESSAGE_HANDLER(FrameMsg_DisownOpener, OnDisownOpener)
+ IPC_MESSAGE_HANDLER(FrameMsg_DispatchLoad, OnDispatchLoad)
IPC_MESSAGE_HANDLER(FrameMsg_CommitNavigation, OnCommitNavigation)
#if defined(OS_ANDROID)
IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems)
@@ -1548,6 +1549,18 @@ void RenderFrameImpl::OnDisownOpener() {
frame_->setOpener(NULL);
}
+void RenderFrameImpl::OnDispatchLoad(int subframe_routing_id) {
nasko 2015/02/24 22:47:11 nit: Shouldn't we call the parameter name "proxy_r
alexmos 2015/02/24 23:31:18 Routing through the proxy made this argument unnec
+ // The child frame should be a proxy in parent's process.
+ RenderFrameProxy* subframe =
+ RenderFrameProxy::FromRoutingID(subframe_routing_id);
+
+ // Only dispatch the event if the proxy still exists.
+ if (subframe) {
+ CHECK(subframe->web_frame()->parent() == frame_);
+ subframe->web_frame()->DispatchLoadEventForFrameOwner();
+ }
+}
+
#if defined(OS_ANDROID)
void RenderFrameImpl::OnSelectPopupMenuItems(
bool canceled,
@@ -2765,6 +2778,10 @@ void RenderFrameImpl::didChangeThemeColor() {
routing_id_, frame_->document().themeColor()));
}
+void RenderFrameImpl::dispatchLoad() {
+ Send(new FrameHostMsg_DispatchLoad(routing_id_));
+}
+
void RenderFrameImpl::requestNotificationPermission(
const blink::WebSecurityOrigin& origin,
blink::WebNotificationPermissionCallback* callback) {
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/test/data/frame_with_load_event.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698