diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 00:29:30 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 00:29:30 +0000 |
| commit | 99516b793712a94107f50654943814bcccc13984 (patch) | |
| tree | 827ac1d4072382d0fee43b0789b9c94bf18fa42d /chrome_frame/urlmon_moniker.cc | |
| parent | e2d9d183c7176d8c147997d084bf35ee9c5478e7 (diff) | |
| download | chromium_src-99516b793712a94107f50654943814bcccc13984.zip chromium_src-99516b793712a94107f50654943814bcccc13984.tar.gz chromium_src-99516b793712a94107f50654943814bcccc13984.tar.bz2 | |
Don't assume that the mime type for documents that mshtml rejects is CF(!)
TEST=If a web site reports a content type that mshtml cannot render (e.g application/text, application/pdf etc) we didn't have a check for our mime type.
BUG=none
Review URL: http://codereview.chromium.org/976007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_moniker.cc')
| -rw-r--r-- | chrome_frame/urlmon_moniker.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/urlmon_moniker.cc b/chrome_frame/urlmon_moniker.cc index eba574e..91885a5 100644 --- a/chrome_frame/urlmon_moniker.cc +++ b/chrome_frame/urlmon_moniker.cc @@ -486,7 +486,7 @@ HRESULT MonikerPatch::BindToStorage(IMoniker_BindToStorage_Fn original, IMoniker* me, IBindCtx* bind_ctx, IMoniker* to_left, REFIID iid, void** obj) { DLOG(INFO) << __FUNCTION__; - DCHECK(iid == IID_IStream); + DCHECK(iid == IID_IStream || iid == IID_IUnknown); DCHECK(to_left == NULL); HRESULT hr = E_UNEXPECTED; |