diff options
| author | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 20:14:00 +0000 |
|---|---|---|
| committer | nasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 20:14:00 +0000 |
| commit | 34b565c73021cf8f9aaf42987cc9998862c2e608 (patch) | |
| tree | f84fd17a64bf09cc98b4de0278ea776b10382fbc /content/browser/ssl | |
| parent | 38191afc4c8573ee57312a580a22196df9817eed (diff) | |
| download | chromium_src-34b565c73021cf8f9aaf42987cc9998862c2e608.zip chromium_src-34b565c73021cf8f9aaf42987cc9998862c2e608.tar.gz chromium_src-34b565c73021cf8f9aaf42987cc9998862c2e608.tar.bz2 | |
Revert 223982 "Remove GetActiveEntry usage from content."
> Remove GetActiveEntry usage from content.
>
> Using GetActiveEntry can lead to subtle bugs, including security ones. See the bug entry for more details.
>
> BUG=273710
>
> Review URL: https://chromiumcodereview.appspot.com/23022006
TBR=nasko@chromium.org
Review URL: https://codereview.chromium.org/23800010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl')
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index 6a6572a..42ee02f 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -87,7 +87,7 @@ void SSLManager::NotifySSLInternalStateChanged(BrowserContext* context) { for (std::set<SSLManager*>::iterator i = managers->get().begin(); i != managers->get().end(); ++i) { (*i)->UpdateEntry(NavigationEntryImpl::FromNavigationEntry( - (*i)->controller()->GetLastCommittedEntry())); + (*i)->controller()->GetActiveEntry())); } } @@ -114,8 +114,7 @@ SSLManager::~SSLManager() { void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { NavigationEntryImpl* entry = - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry()); + NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()); if (details.is_main_frame) { if (entry) { @@ -145,14 +144,12 @@ void SSLManager::DidCommitProvisionalLoad(const LoadCommittedDetails& details) { void SSLManager::DidDisplayInsecureContent() { UpdateEntry( - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry())); + NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry())); } void SSLManager::DidRunInsecureContent(const std::string& security_origin) { NavigationEntryImpl* navigation_entry = - NavigationEntryImpl::FromNavigationEntry( - controller_->GetLastCommittedEntry()); + NavigationEntryImpl::FromNavigationEntry(controller_->GetActiveEntry()); policy()->DidRunInsecureContent(navigation_entry, security_origin); UpdateEntry(navigation_entry); } |