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

Unified Diff: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

Issue 811263002: Queue postMessage messages destined for a MimeHandlerView guest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@postMessage1
Patch Set: Created 6 years 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
Index: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 1cbe95a796010ccee39e62b0e32e3210eb43dd9b..b3900f0c582a0f0e289757b67b92b953dab01aa0 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -81,6 +81,7 @@ MimeHandlerViewContainer::MimeHandlerViewContainer(
mime_type_(mime_type),
original_url_(original_url),
guest_proxy_routing_id_(-1),
+ guest_loaded_(false),
weak_factory_(this) {
DCHECK(!mime_type_.empty());
is_embedded_ = !render_frame->GetWebFrame()->document().isPluginDocument();
@@ -120,6 +121,8 @@ bool MimeHandlerViewContainer::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(MimeHandlerViewContainer, message)
IPC_MESSAGE_HANDLER(ExtensionMsg_CreateMimeHandlerViewGuestACK,
OnCreateMimeHandlerViewGuestACK)
+ IPC_MESSAGE_HANDLER(ExtensionMsg_MimeHandlerViewGuestOnLoadCompleted,
+ OnMimeHandlerViewGuestOnLoadCompleted)
IPC_MESSAGE_HANDLER(ExtensionMsg_GuestAttached, OnGuestAttached)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP()
@@ -153,6 +156,13 @@ void MimeHandlerViewContainer::didFinishLoading(
void MimeHandlerViewContainer::PostMessage(v8::Isolate* isolate,
v8::Handle<v8::Value> message) {
+ if (!guest_loaded_) {
+ linked_ptr<ScopedPersistent<v8::Value>> scoped_persistent(
+ new ScopedPersistent<v8::Value>(isolate, message));
+ pending_messages_.push_back(scoped_persistent);
+ return;
+ }
+
content::RenderView* guest_proxy_render_view =
content::RenderView::FromRoutingID(guest_proxy_routing_id_);
if (!guest_proxy_render_view)
@@ -186,6 +196,26 @@ void MimeHandlerViewContainer::OnCreateMimeHandlerViewGuestACK(
render_frame()->AttachGuest(element_instance_id);
}
+void MimeHandlerViewContainer::OnMimeHandlerViewGuestOnLoadCompleted(
+ int /* unused */) {
+ guest_loaded_ = true;
+ if (pending_messages_.empty())
+ return;
+
+ // Now that the guest has loaded, flush any unsent messages.
+ blink::WebFrame* frame = render_frame()->GetWebFrame();
+ if (!frame)
+ return;
+
+ v8::Isolate* isolate = v8::Isolate::GetCurrent();
+ v8::HandleScope handle_scope(isolate);
+ v8::Context::Scope context_scope(frame->mainWorldScriptContext());
+ for (const auto& pending_message : pending_messages_)
+ PostMessage(isolate, pending_message->NewHandle(isolate));
+
+ pending_messages_.clear();
+}
+
void MimeHandlerViewContainer::OnGuestAttached(int /* unused */,
int guest_proxy_routing_id) {
// Save the RenderView routing ID of the guest here so it can be used to route

Powered by Google App Engine
This is Rietveld 408576698