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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 851333005: Revert of Make RenderFrame(Host) own a RenderWidget(Host). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_thread_impl.h » ('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 7c0ac990c6ef6c32559c2ec884a93dcc08283201..b4113dde2666d8a90ab6ad84a89149e7a3c11582 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -117,7 +117,6 @@
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebColorSuggestion.h"
#include "third_party/WebKit/public/web/WebDocument.h"
-#include "third_party/WebKit/public/web/WebFrameWidget.h"
#include "third_party/WebKit/public/web/WebGlyphCache.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebMediaStreamRegistry.h"
@@ -552,9 +551,7 @@
int routing_id,
int parent_routing_id,
int proxy_routing_id,
- const FrameReplicationState& replicated_state,
- CompositorDependencies* compositor_deps,
- const FrameMsg_NewFrame_WidgetParams& widget_params) {
+ const FrameReplicationState& replicated_state) {
// TODO(nasko): For now, this message is only sent for subframes, as the
// top level frame is created when the RenderView is created through the
// ViewMsg_New IPC.
@@ -586,20 +583,6 @@
web_frame->initializeToReplaceRemoteFrame(proxy->web_frame());
}
render_frame->SetWebFrame(web_frame);
-
- if (widget_params.routing_id != MSG_ROUTING_NONE) {
- CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kSitePerProcess));
- render_frame->render_widget_ = RenderWidget::CreateForFrame(
- widget_params.routing_id, widget_params.surface_id,
- widget_params.hidden, render_frame->render_view_->screen_info(),
- compositor_deps, web_frame);
- // TODO(kenrb): Observing shouldn't be necessary when we sort out
- // WasShown and WasHidden, separating page-level visibility from
- // frame-level visibility.
- render_frame->render_widget_->RegisterRenderFrame(render_frame);
- }
-
render_frame->Initialize();
}
@@ -3583,13 +3566,6 @@
}
void RenderFrameImpl::WasShown() {
- // TODO(kenrb): Need to figure out how to do this better. Should
- // VisibilityState remain a page-level concept or move to frames?
- // The semantics of 'Show' might have to change here.
- if (render_widget_) {
- render_view()->webview()->setVisibilityState(
- blink::WebPageVisibilityStateVisible, false);
- }
FOR_EACH_OBSERVER(RenderFrameObserver, observers_, WasShown());
}
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698