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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1602663003: Framelet Prototype 2016 using Mojo IPC Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Disabled oilpan Created 4 years, 11 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/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9e059675510bfae4e210991066bde776368991e0..42025f8f0bd5f8e07455282a1ce1a0ccad7aae1e 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -41,6 +41,7 @@
#include "content/child/service_worker/service_worker_network_provider.h"
#include "content/child/service_worker/service_worker_provider_context.h"
#include "content/child/service_worker/web_service_worker_provider_impl.h"
+#include "content/child/thread_safe_sender.h"
#include "content/child/v8_value_converter_impl.h"
#include "content/child/web_url_loader_impl.h"
#include "content/child/web_url_request_util.h"
@@ -160,6 +161,8 @@
#include "third_party/WebKit/public/web/WebFindOptions.h"
#include "third_party/WebKit/public/web/WebFrameSerializer.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h"
+#include "third_party/WebKit/public/web/WebFramelet.h"
+#include "third_party/WebKit/public/web/WebFrameletClient.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
@@ -2616,6 +2619,13 @@ blink::WebFrame* RenderFrameImpl::createChildFrame(
return web_frame;
}
+blink::WebFramelet* RenderFrameImpl::createFramelet(const blink::WebURL& url) {
+ blink::WebFrameletClient* client =
+ GetContentClient()->renderer()->CreateFramelet(
+ this, GURL(url), RenderThreadImpl::current()->thread_safe_sender());
+ return blink::WebFramelet::create(client);
+}
+
void RenderFrameImpl::didChangeOpener(blink::WebFrame* opener) {
// Only active frames are able to disown their opener.
if (!opener && is_swapped_out_)
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | extensions/browser/guest_view/extensions_guest_view_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698