diff options
| author | khorimoto@chromium.org <khorimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 01:15:29 +0000 |
|---|---|---|
| committer | khorimoto@chromium.org <khorimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 01:15:29 +0000 |
| commit | def55e02c79cd340a6a8a778e422da16bf94ae28 (patch) | |
| tree | 5eeec15358714a8b20a5821298f93b9fad6e74b8 | |
| parent | 1cfc04fee027726d2d5cb0c02043663fb00da5fc (diff) | |
| download | chromium_src-def55e02c79cd340a6a8a778e422da16bf94ae28.zip chromium_src-def55e02c79cd340a6a8a778e422da16bf94ae28.tar.gz chromium_src-def55e02c79cd340a6a8a778e422da16bf94ae28.tar.bz2 | |
Add DCHECK(), remove if statement to prevent NULL pointer dereference.
BUG=
TEST=
CID=102400
TBR=jamesr
Review URL: https://chromiumcodereview.appspot.com/10829028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148462 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/render_view_impl.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 06d639f..5e1210a 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -3307,12 +3307,11 @@ void RenderViewImpl::willSendRequest(WebFrame* frame, content::PageTransition transition_type = content::PAGE_TRANSITION_LINK; DocumentState* document_state = DocumentState::FromDataSource(data_source); + DCHECK(document_state); NavigationState* navigation_state = document_state->navigation_state(); - if (document_state) { - if (document_state->is_cache_policy_override_set()) - request.setCachePolicy(document_state->cache_policy_override()); - transition_type = navigation_state->transition_type(); - } + if (document_state->is_cache_policy_override_set()) + request.setCachePolicy(document_state->cache_policy_override()); + transition_type = navigation_state->transition_type(); WebKit::WebReferrerPolicy referrer_policy; if (document_state && document_state->is_referrer_policy_set()) { |