Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Side by Side Diff: chrome_frame/urlmon_bind_status_callback.cc

Issue 21948002: Add missing DCHECK to validate HR. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix error testing Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome_frame/urlmon_moniker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/urlmon_bind_status_callback.h" 5 #include "chrome_frame/urlmon_bind_status_callback.h"
6 6
7 #include <mshtml.h> 7 #include <mshtml.h>
8 #include <shlguid.h> 8 #include <shlguid.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 STDMETHODIMP BSCBStorageBind::OnStopBinding(HRESULT hresult, LPCWSTR error) { 314 STDMETHODIMP BSCBStorageBind::OnStopBinding(HRESULT hresult, LPCWSTR error) {
315 DVLOG(1) << __FUNCTION__ 315 DVLOG(1) << __FUNCTION__
316 << base::StringPrintf(" tid=%i", base::PlatformThread::CurrentId()); 316 << base::StringPrintf(" tid=%i", base::PlatformThread::CurrentId());
317 // Report all crashes in the exception handler if we wrap the callback. 317 // Report all crashes in the exception handler if we wrap the callback.
318 // Note that this avoids having the VEH report a crash if an SEH earlier in 318 // Note that this avoids having the VEH report a crash if an SEH earlier in
319 // the chain handles the exception. 319 // the chain handles the exception.
320 ExceptionBarrier barrier; 320 ExceptionBarrier barrier;
321 321
322 HRESULT hr = MayPlayBack(BSCF_LASTDATANOTIFICATION); 322 HRESULT hr = MayPlayBack(BSCF_LASTDATANOTIFICATION);
323 if (FAILED(hr))
324 return hr;
323 hr = CallbackImpl::OnStopBinding(hresult, error); 325 hr = CallbackImpl::OnStopBinding(hresult, error);
324 ReleaseBind(); 326 ReleaseBind();
325 return hr; 327 return hr;
326 } 328 }
327 329
328 // Play back the cached data to the delegate. Normally this would happen 330 // Play back the cached data to the delegate. Normally this would happen
329 // when we have read enough data to determine the renderer. In this case 331 // when we have read enough data to determine the renderer. In this case
330 // we first play back the data from the cache and then go into a 'pass 332 // we first play back the data from the cache and then go into a 'pass
331 // through' mode. In some cases we may end up getting OnStopBinding 333 // through' mode. In some cases we may end up getting OnStopBinding
332 // before we get a chance to determine. Also it's possible that the 334 // before we get a chance to determine. Also it's possible that the
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 case BINDSTATUS_CACHEFILENAMEAVAILABLE: 420 case BINDSTATUS_CACHEFILENAMEAVAILABLE:
419 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE: 421 case BINDSTATUS_SERVER_MIMETYPEAVAILABLE:
420 return true; 422 return true;
421 default: 423 default:
422 break; 424 break;
423 } 425 }
424 } 426 }
425 427
426 return false; 428 return false;
427 } 429 }
OLDNEW
« no previous file with comments | « no previous file | chrome_frame/urlmon_moniker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698