diff options
| author | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 22:08:53 +0000 |
|---|---|---|
| committer | stoyan@chromium.org <stoyan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-16 22:08:53 +0000 |
| commit | 0faecc360bbd658830bf9ff6f95d97e4af5daa5a (patch) | |
| tree | 0b338340ccdffbd8f45e2052552e67e1ee05c25e /chrome_frame | |
| parent | 6e19ec63085dc21d5604382e84fcbee5617e5dd1 (diff) | |
| download | chromium_src-0faecc360bbd658830bf9ff6f95d97e4af5daa5a.zip chromium_src-0faecc360bbd658830bf9ff6f95d97e4af5daa5a.tar.gz chromium_src-0faecc360bbd658830bf9ff6f95d97e4af5daa5a.tar.bz2 | |
Revert 56241 - Add an exceptionbarrier in Hook_Start(Ex). This is an attempt to reduce the amount of false positive crash reports - when exception is swallowed and is almost always not a problem due ChromeFrame code.
BUG=51830
Review URL: http://codereview.chromium.org/3171011
TBR=stoyan@chromium.org
Review URL: http://codereview.chromium.org/3191003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/protocol_sink_wrap.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc index c435a02..0b3e5a7 100644 --- a/chrome_frame/protocol_sink_wrap.cc +++ b/chrome_frame/protocol_sink_wrap.cc @@ -175,7 +175,6 @@ STDMETHODIMP ProtocolSinkWrap::ReportResult(HRESULT result, DWORD error, LPCWSTR result_text) { DLOG(INFO) << "ProtocolSinkWrap::ReportResult: result: " << result << " error: " << error << " Text: " << (result_text ? result_text : L""); - ExceptionBarrier barrier; HRESULT hr = prot_data_->ReportResult(delegate_, result, error, result_text); return hr; } @@ -614,7 +613,6 @@ STDMETHODIMP Hook_Start(InternetProtocol_Start_Fn orig_start, return E_INVALIDARG; DLOG_IF(INFO, url != NULL) << "OnStart: " << url << PiFlags2Str(flags); - ExceptionBarrier barrier; ScopedComPtr<IBindCtx> bind_ctx = BindCtxFromIBindInfo(bind_info); if (!bind_ctx) { // MSHTML sometimes takes a short path, skips the creation of @@ -667,7 +665,6 @@ STDMETHODIMP Hook_StartEx(InternetProtocol_StartEx_Fn orig_start_ex, if (!uri || !prot_sink || !bind_info) return E_INVALIDARG; - ExceptionBarrier barrier; ScopedBstr url; uri->GetPropertyBSTR(Uri_PROPERTY_ABSOLUTE_URI, url.Receive(), 0); DLOG_IF(INFO, url != NULL) << "OnStartEx: " << url << PiFlags2Str(flags); |