diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 19:10:50 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-17 19:10:50 +0000 |
| commit | b3300dc30deee1992729a78bc5c053c7a136d6a7 (patch) | |
| tree | 1fc29ccffe3b5b6b231f86b62bcd5f8a9e6c904e /chrome/browser/external_tab_container.cc | |
| parent | 0cae1e7affb7fddafa062b452e555039e38a051e (diff) | |
| download | chromium_src-b3300dc30deee1992729a78bc5c053c7a136d6a7.zip chromium_src-b3300dc30deee1992729a78bc5c053c7a136d6a7.tar.gz chromium_src-b3300dc30deee1992729a78bc5c053c7a136d6a7.tar.bz2 | |
Fix a crash in ChromeFrame caused by incorrectly instantiating the automation url request context used
by the host network stack implementation with a NULL AutomationResourceMessageFilter pointer.
Fixes bug http://code.google.com/p/chromium/issues/detail?id=29025
Will add a test for this in a subsequent CL.
Bug=29025
Review URL: http://codereview.chromium.org/505033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container.cc')
| -rw-r--r-- | chrome/browser/external_tab_container.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 2775960..716b8ef 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -187,6 +187,8 @@ bool ExternalTabContainer::Reinitialize( automation_resource_message_filter_ = filter; if (load_requests_via_automation_) { + InitializeAutomationRequestContext(tab_handle_); + RenderViewHost* rvh = tab_contents_->render_view_host(); if (rvh) { AutomationResourceMessageFilter::RegisterRenderView( @@ -206,9 +208,6 @@ bool ExternalTabContainer::Reinitialize( void ExternalTabContainer::SetTabHandle(int handle) { tab_handle_ = handle; - if (load_requests_via_automation_) { - InitializeAutomationRequestContext(handle); - } } void ExternalTabContainer::ProcessUnhandledAccelerator(const MSG& msg) { |