diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 15:54:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 15:54:50 +0000 |
| commit | 730943c5d8dc28c55873e813c9d28c336cf477b5 (patch) | |
| tree | 5cdde72f022efd952c7b5336c530487a9504a4c7 /content | |
| parent | d3e3fc1cbd23964e850a5f37ea65a7e07c29cc9b (diff) | |
| download | chromium_src-730943c5d8dc28c55873e813c9d28c336cf477b5.zip chromium_src-730943c5d8dc28c55873e813c9d28c336cf477b5.tar.gz chromium_src-730943c5d8dc28c55873e813c9d28c336cf477b5.tar.bz2 | |
Add CHECKs to see if anyone sets a RenderViewHost's delegate to NULL.
BUG=82827
Review URL: http://codereview.chromium.org/7034049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_view_host.cc | 2 | ||||
| -rw-r--r-- | content/browser/renderer_host/render_view_host.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc index df67cb4..2044e66 100644 --- a/content/browser/renderer_host/render_view_host.cc +++ b/content/browser/renderer_host/render_view_host.cc @@ -109,7 +109,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance, } DCHECK(instance_); - DCHECK(delegate_); + CHECK(delegate_); // http://crbug.com/82827 content::GetContentClient()->browser()->RenderViewHostCreated(this); diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h index 0cf0803..bd2e06c 100644 --- a/content/browser/renderer_host/render_view_host.h +++ b/content/browser/renderer_host/render_view_host.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/process_util.h" @@ -109,7 +110,10 @@ class RenderViewHost : public RenderWidgetHost { SiteInstance* site_instance() const { return instance_; } RenderViewHostDelegate* delegate() const { return delegate_; } - void set_delegate(RenderViewHostDelegate* d) { delegate_ = d; } + void set_delegate(RenderViewHostDelegate* d) { + CHECK(d); // http://crbug.com/82827 + delegate_ = d; + } // Set up the RenderView child process. Virtual because it is overridden by // TestRenderViewHost. If the |frame_name| parameter is non-empty, it is used |