| 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 b09ff1f52d345a6096cb853dcfc142ae3186f36a..0c6793ffd1d069df67742a4014d5760fbf69e2ec 100644
|
| --- a/content/browser/renderer_host/render_view_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_view_host_impl.cc
|
| @@ -177,8 +177,7 @@ RenderViewHost* RenderViewHost::FromID(int render_process_id,
|
|
|
| // static
|
| RenderViewHost* RenderViewHost::From(RenderWidgetHost* rwh) {
|
| - DCHECK(rwh->IsRenderView());
|
| - return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
|
| + return RenderViewHostImpl::From(rwh);
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -194,6 +193,12 @@ RenderViewHostImpl* RenderViewHostImpl::FromID(int render_process_id,
|
| return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(widget));
|
| }
|
|
|
| +// static
|
| +RenderViewHostImpl* RenderViewHostImpl::From(RenderWidgetHost* rwh) {
|
| + DCHECK(rwh->IsRenderView());
|
| + return static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(rwh));
|
| +}
|
| +
|
| RenderViewHostImpl::RenderViewHostImpl(
|
| SiteInstance* instance,
|
| RenderViewHostDelegate* delegate,
|
| @@ -738,9 +743,9 @@ bool RenderViewHostImpl::Send(IPC::Message* msg) {
|
| return RenderWidgetHostImpl::Send(msg);
|
| }
|
|
|
| -RenderWidgetHost* RenderViewHostImpl::GetWidget() const {
|
| - return const_cast<RenderWidgetHost*>(
|
| - static_cast<const RenderWidgetHost*>(this));
|
| +RenderWidgetHostImpl* RenderViewHostImpl::GetWidget() const {
|
| + return const_cast<RenderWidgetHostImpl*>(
|
| + static_cast<const RenderWidgetHostImpl*>(this));
|
| }
|
|
|
| RenderProcessHost* RenderViewHostImpl::GetProcess() const {
|
|
|