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

Side by Side Diff: content/public/renderer/render_view_observer.cc

Issue 2493293002: RenderWidget: make routing_id be a parameter of the ctor (Closed)
Patch Set: Add a release for asan bots. Created 4 years, 1 month 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
« no previous file with comments | « no previous file | content/renderer/mus/compositor_mus_connection_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/public/renderer/render_view_observer.h" 5 #include "content/public/renderer/render_view_observer.h"
6 6
7 #include "content/renderer/render_view_impl.h" 7 #include "content/renderer/render_view_impl.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 RenderViewObserver::RenderViewObserver(RenderView* render_view) 11 RenderViewObserver::RenderViewObserver(RenderView* render_view)
12 : render_view_(static_cast<RenderViewImpl*>(render_view)), 12 : render_view_(static_cast<RenderViewImpl*>(render_view)),
13 routing_id_(MSG_ROUTING_NONE) { 13 routing_id_(MSG_ROUTING_NONE) {
14 // |render_view_| can be null on unit testing or if Observe() is used. 14 // |render_view_| can be null on unit testing or if Observe() is used.
15 if (render_view_) { 15 if (render_view_) {
16 routing_id_ = render_view_->GetRoutingID(); 16 routing_id_ = render_view_->GetRoutingID();
17 // TODO(jam/nick): bring this back DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
18 render_view_->AddObserver(this); 17 render_view_->AddObserver(this);
19 } 18 }
20 } 19 }
21 20
22 RenderViewObserver::~RenderViewObserver() { 21 RenderViewObserver::~RenderViewObserver() {
23 if (render_view_) 22 if (render_view_)
24 render_view_->RemoveObserver(this); 23 render_view_->RemoveObserver(this);
25 } 24 }
26 25
27 bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) { 26 bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) {
(...skipping 12 matching lines...) Expand all
40 return render_view_; 39 return render_view_;
41 } 40 }
42 41
43 void RenderViewObserver::RenderViewGone() { 42 void RenderViewObserver::RenderViewGone() {
44 render_view_ = nullptr; 43 render_view_ = nullptr;
45 } 44 }
46 45
47 void RenderViewObserver::Observe(RenderView* render_view) { 46 void RenderViewObserver::Observe(RenderView* render_view) {
48 if (render_view_) { 47 if (render_view_) {
49 render_view_->RemoveObserver(this); 48 render_view_->RemoveObserver(this);
50 routing_id_ = 0; 49 routing_id_ = MSG_ROUTING_NONE;
51 } 50 }
52 51
53 render_view_ = static_cast<RenderViewImpl*>(render_view); 52 render_view_ = static_cast<RenderViewImpl*>(render_view);
54 if (render_view_) { 53 if (render_view_) {
55 routing_id_ = render_view_->GetRoutingID(); 54 routing_id_ = render_view_->GetRoutingID();
56 render_view_->AddObserver(this); 55 render_view_->AddObserver(this);
57 } 56 }
58 } 57 }
59 58
60 } // namespace content 59 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/mus/compositor_mus_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698