content/browser/renderer_host/render_view_host_impl.cc - Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends

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/browser/renderer_host/render_view_host_impl.cc

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt

Patch Set: fix more tests Created 5 years, 3 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/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/renderer_host/render_view_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_view_host_impl.cc

diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc

index d6e0956d3b4e9d32eb6fc4d078af7f200195dd3f..328f1e6d2303cece9ed4a23db7a9b29c05935cea 100644

--- a/content/browser/renderer_host/render_view_host_impl.cc

+++ b/content/browser/renderer_host/render_view_host_impl.cc

@@ -199,7 +199,6 @@ RenderViewHostImpl::RenderViewHostImpl(

RenderViewHostDelegate* delegate,

RenderWidgetHostDelegate* widget_delegate,

int32 routing_id,

- int32 surface_id,

int32 main_frame_routing_id,

bool swapped_out,

bool hidden,

@@ -207,7 +206,6 @@ RenderViewHostImpl::RenderViewHostImpl(

: RenderWidgetHostImpl(widget_delegate,

instance->GetProcess(),

routing_id,

- surface_id,

hidden),

frames_ref_count_(0),

delegate_(delegate),

@@ -312,7 +310,6 @@ bool RenderViewHostImpl::CreateRenderView(

params.web_preferences = GetWebkitPreferences();

params.view_id = GetRoutingID();

params.main_frame_routing_id = main_frame_routing_id_;

- params.surface_id = surface_id();

params.session_storage_namespace_id =

delegate_->GetSessionStorageNamespace(instance_.get())->id();

// Ensure the RenderView sets its opener correctly.

@@ -992,16 +989,12 @@ void RenderViewHostImpl::CreateNewWindow(

}

void RenderViewHostImpl::CreateNewWidget(int32 route_id,

- int32 surface_id,

blink::WebPopupType popup_type) {

- delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, surface_id,

- popup_type);

+ delegate_->CreateNewWidget(GetProcess()->GetID(), route_id, popup_type);

}

-void RenderViewHostImpl::CreateNewFullscreenWidget(int32 route_id,

- int32 surface_id) {

- delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id,

- surface_id);

+void RenderViewHostImpl::CreateNewFullscreenWidget(int32 route_id) {

+ delegate_->CreateNewFullscreenWidget(GetProcess()->GetID(), route_id);

}

void RenderViewHostImpl::OnShowView(int route_id,