content/renderer/web_ui_mojo.cc - Issue 285333003: Support exposing Mojo services between render frames, render threads, and their respective hosts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/web_ui_mojo.cc

Issue 285333003: Support exposing Mojo services between render frames, render threads, and their respective hosts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: handle the case where handles arrive before the RenderFrame is ready Created 6 years, 6 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

Index: content/renderer/web_ui_mojo.cc

diff --git a/content/renderer/web_ui_mojo.cc b/content/renderer/web_ui_mojo.cc

index 38c71d5c1c6574b3e7383701b26e29cf1b313267..45c05eee2ece025154d6ef2f3cbfd816cf59538b 100644

--- a/content/renderer/web_ui_mojo.cc

+++ b/content/renderer/web_ui_mojo.cc

@@ -5,6 +5,7 @@

#include "content/renderer/web_ui_mojo.h"

#include "content/common/view_messages.h"

+#include "content/public/common/service_registry.h"

#include "content/public/renderer/render_frame.h"

#include "content/public/renderer/render_view.h"

#include "content/renderer/web_ui_mojo_context_state.h"

@@ -84,8 +85,11 @@ void WebUIMojo::DestroyContextState(v8::Handle<v8::Context> context) {

void WebUIMojo::OnDidFinishDocumentLoad() {

did_finish_document_load_ = true;

- if (pending_handle_.is_valid())

- SetHandleOnContextState(pending_handle_.Pass());

+ mojo::MessagePipe pipe;

+ SetHandleOnContextState(pipe.handle0.Pass());

+ RenderFrame::FromWebFrame(render_view()->GetWebView()->mainFrame())

+ ->GetServiceRegistry()

+ ->GetInterface("webui_controller", pipe.handle1.Pass());

}

void WebUIMojo::SetHandleOnContextState(mojo::ScopedMessagePipeHandle handle) {

« content/public/common/service_registry.h ('K') | « content/renderer/render_thread_impl.cc ('k') | content/renderer/web_ui_setup_impl.h » ('j') | no next file with comments »