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

Side by Side Diff: content/browser/renderer_host/render_widget_helper.cc

Issue 643733002: Add RoutingIDIssuer to ensure the correctness of ID to be routed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_helper.h" 5 #include "content/browser/renderer_host/render_widget_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/posix/eintr_wrapper.h" 10 #include "base/posix/eintr_wrapper.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "content/browser/dom_storage/session_storage_namespace_impl.h"
13 #include "content/browser/gpu/gpu_process_host_ui_shim.h" 14 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
14 #include "content/browser/gpu/gpu_surface_tracker.h" 15 #include "content/browser/gpu/gpu_surface_tracker.h"
15 #include "content/browser/loader/resource_dispatcher_host_impl.h" 16 #include "content/browser/loader/resource_dispatcher_host_impl.h"
16 #include "content/browser/renderer_host/render_process_host_impl.h" 17 #include "content/browser/renderer_host/render_process_host_impl.h"
17 #include "content/browser/renderer_host/render_view_host_impl.h" 18 #include "content/browser/renderer_host/render_view_host_impl.h"
18 #include "content/browser/dom_storage/session_storage_namespace_impl.h" 19 #include "content/browser/renderer_host/routing_id_issuer.h"
19 #include "content/common/view_messages.h" 20 #include "content/common/view_messages.h"
20 21
21 namespace content { 22 namespace content {
22 namespace { 23 namespace {
23 24
24 typedef std::map<int, RenderWidgetHelper*> WidgetHelperMap; 25 typedef std::map<int, RenderWidgetHelper*> WidgetHelperMap;
25 base::LazyInstance<WidgetHelperMap> g_widget_helpers = 26 base::LazyInstance<WidgetHelperMap> g_widget_helpers =
26 LAZY_INSTANCE_INITIALIZER; 27 LAZY_INSTANCE_INITIALIZER;
27 28
28 void AddWidgetHelper(int render_process_id, 29 void AddWidgetHelper(int render_process_id,
29 const scoped_refptr<RenderWidgetHelper>& widget_helper) { 30 const scoped_refptr<RenderWidgetHelper>& widget_helper) {
30 DCHECK_CURRENTLY_ON(BrowserThread::IO); 31 DCHECK_CURRENTLY_ON(BrowserThread::IO);
31 // We don't care if RenderWidgetHelpers overwrite an existing process_id. Just 32 // We don't care if RenderWidgetHelpers overwrite an existing process_id. Just
32 // want this to be up to date. 33 // want this to be up to date.
33 g_widget_helpers.Get()[render_process_id] = widget_helper.get(); 34 g_widget_helpers.Get()[render_process_id] = widget_helper.get();
34 } 35 }
35 36
36 } // namespace 37 } // namespace
37 38
38 RenderWidgetHelper::RenderWidgetHelper() 39 RenderWidgetHelper::RenderWidgetHelper()
39 : render_process_id_(-1), 40 : render_process_id_(-1),
41 routing_id_issuer_(RoutingIDIssuer::Create()),
40 resource_dispatcher_host_(NULL) { 42 resource_dispatcher_host_(NULL) {
41 } 43 }
42 44
43 RenderWidgetHelper::~RenderWidgetHelper() { 45 RenderWidgetHelper::~RenderWidgetHelper() {
44 DCHECK_CURRENTLY_ON(BrowserThread::IO); 46 DCHECK_CURRENTLY_ON(BrowserThread::IO);
45 47
46 // Delete this RWH from the map if it is found. 48 // Delete this RWH from the map if it is found.
47 WidgetHelperMap& widget_map = g_widget_helpers.Get(); 49 WidgetHelperMap& widget_map = g_widget_helpers.Get();
48 WidgetHelperMap::iterator it = widget_map.find(render_process_id_); 50 WidgetHelperMap::iterator it = widget_map.find(render_process_id_);
49 if (it != widget_map.end() && it->second == this) 51 if (it != widget_map.end() && it->second == this)
(...skipping 10 matching lines...) Expand all
60 render_process_id_ = render_process_id; 62 render_process_id_ = render_process_id;
61 resource_dispatcher_host_ = resource_dispatcher_host; 63 resource_dispatcher_host_ = resource_dispatcher_host;
62 64
63 BrowserThread::PostTask( 65 BrowserThread::PostTask(
64 BrowserThread::IO, FROM_HERE, 66 BrowserThread::IO, FROM_HERE,
65 base::Bind(&AddWidgetHelper, 67 base::Bind(&AddWidgetHelper,
66 render_process_id_, make_scoped_refptr(this))); 68 render_process_id_, make_scoped_refptr(this)));
67 } 69 }
68 70
69 int RenderWidgetHelper::GetNextRoutingID() { 71 int RenderWidgetHelper::GetNextRoutingID() {
70 return next_routing_id_.GetNext() + 1; 72 return routing_id_issuer_->IssueNext();
73 }
74
75 bool RenderWidgetHelper::IsRoutingIDProbablyValid(int routing_id) const {
76 return routing_id_issuer_->IsProbablyValid(routing_id);
71 } 77 }
72 78
73 // static 79 // static
74 RenderWidgetHelper* RenderWidgetHelper::FromProcessHostID( 80 RenderWidgetHelper* RenderWidgetHelper::FromProcessHostID(
75 int render_process_host_id) { 81 int render_process_host_id) {
76 DCHECK_CURRENTLY_ON(BrowserThread::IO); 82 DCHECK_CURRENTLY_ON(BrowserThread::IO);
77 WidgetHelperMap::const_iterator ci = g_widget_helpers.Get().find( 83 WidgetHelperMap::const_iterator ci = g_widget_helpers.Get().find(
78 render_process_host_id); 84 render_process_host_id);
79 return (ci == g_widget_helpers.Get().end())? NULL : ci->second; 85 return (ci == g_widget_helpers.Get().end())? NULL : ci->second;
80 } 86 }
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) { 262 i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
257 if (IGNORE_EINTR(close(i->second)) < 0) 263 if (IGNORE_EINTR(close(i->second)) < 0)
258 PLOG(ERROR) << "close: " << i->first; 264 PLOG(ERROR) << "close: " << i->first;
259 } 265 }
260 266
261 allocated_dibs_.clear(); 267 allocated_dibs_.clear();
262 } 268 }
263 #endif 269 #endif
264 270
265 } // namespace content 271 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_helper.h ('k') | content/browser/renderer_host/routing_id_issuer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698