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

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

Issue 1674543004: Separate RenderView from RenderWidget, part 1: inheritance. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@renderwidgettest
Patch Set: Created 4 years, 10 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) 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 using blink::WebFrame;
10
11 namespace content { 9 namespace content {
12 10
13 RenderViewObserver::RenderViewObserver(RenderView* render_view) 11 RenderViewObserver::RenderViewObserver(RenderView* render_view)
14 : render_view_(render_view), 12 : render_view_(static_cast<RenderViewImpl*>(render_view)),
15 routing_id_(MSG_ROUTING_NONE) { 13 routing_id_(MSG_ROUTING_NONE) {
16 // |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.
17 if (render_view) { 15 if (render_view_) {
18 RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view); 16 routing_id_ = render_view_->GetRoutingID();
19 routing_id_ = impl->routing_id();
20 // TODO(jam): bring this back DCHECK_NE(routing_id_, MSG_ROUTING_NONE); 17 // TODO(jam): bring this back DCHECK_NE(routing_id_, MSG_ROUTING_NONE);
21 impl->AddObserver(this); 18 render_view_->AddObserver(this);
22 } 19 }
23 } 20 }
24 21
25 RenderViewObserver::~RenderViewObserver() { 22 RenderViewObserver::~RenderViewObserver() {
26 if (render_view_) { 23 if (render_view_)
27 RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_); 24 render_view_->RemoveObserver(this);
28 impl->RemoveObserver(this);
29 }
30 } 25 }
31 26
32 void RenderViewObserver::OnDestruct() { 27 void RenderViewObserver::OnDestruct() {
33 delete this; 28 delete this;
34 } 29 }
35 30
36 bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) { 31 bool RenderViewObserver::OnMessageReceived(const IPC::Message& message) {
37 return false; 32 return false;
38 } 33 }
39 34
40 bool RenderViewObserver::Send(IPC::Message* message) { 35 bool RenderViewObserver::Send(IPC::Message* message) {
41 if (render_view_) 36 if (render_view_)
42 return render_view_->Send(message); 37 return render_view_->Send(message);
43 38
44 delete message; 39 delete message;
45 return false; 40 return false;
46 } 41 }
47 42
48 RenderView* RenderViewObserver::render_view() const { 43 RenderView* RenderViewObserver::render_view() const {
49 return render_view_; 44 return render_view_;
50 } 45 }
51 46
52 void RenderViewObserver::RenderViewGone() { 47 void RenderViewObserver::RenderViewGone() {
53 render_view_ = NULL; 48 render_view_ = nullptr;
54 } 49 }
55 50
56 void RenderViewObserver::Observe(RenderView* render_view) { 51 void RenderViewObserver::Observe(RenderView* render_view) {
57 RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view_); 52 if (render_view_) {
58 if (impl) { 53 render_view_->RemoveObserver(this);
59 impl->RemoveObserver(this);
60 routing_id_ = 0; 54 routing_id_ = 0;
61 } 55 }
62 56
63 render_view_ = render_view; 57 render_view_ = static_cast<RenderViewImpl*>(render_view);
64 impl = static_cast<RenderViewImpl*>(render_view_); 58 if (render_view_) {
65 if (impl) { 59 routing_id_ = render_view_->GetRoutingID();
66 routing_id_ = impl->routing_id(); 60 render_view_->AddObserver(this);
67 impl->AddObserver(this);
68 } 61 }
69 } 62 }
70 63
71 } // namespace content 64 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698