content/browser/renderer_host/render_widget_host_input_event_router.cc - Issue 1996783002: Make cc::SurfaceId unguessable

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_widget_host_input_event_router.cc

Issue 1996783002: Make cc::SurfaceId unguessable (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed Ben's comment Created 4 years, 7 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/frame_host/cross_process_frame_connector.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_input_event_router.cc

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

index e23fe255e42b66b476944c7482db836b3193ceae..e1d4f1c539ddf18143c28aba58ba97f8180f04c3 100644

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

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

@@ -273,7 +273,7 @@ void RenderWidgetHostInputEventRouter::RemoveSurfaceIdNamespaceOwner(

}

for (auto it = hittest_data_.begin(); it != hittest_data_.end();) {

- if (cc::SurfaceIdAllocator::NamespaceForId(it->first) == id)

+ if (it->first.id_namespace() == id)

it = hittest_data_.erase(it);

else

++it;

@@ -282,8 +282,7 @@ void RenderWidgetHostInputEventRouter::RemoveSurfaceIdNamespaceOwner(

void RenderWidgetHostInputEventRouter::OnHittestData(

const FrameHostMsg_HittestData_Params& params) {

- if (owner_map_.find(cc::SurfaceIdAllocator::NamespaceForId(

- params.surface_id)) == owner_map_.end()) {

+ if (owner_map_.find(params.surface_id.id_namespace()) == owner_map_.end()) {

return;

}

HittestData data;