diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 20:07:35 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 20:07:35 +0000 |
| commit | 2b3102bea014c815d42aaf99a97e8da462a6ea5c (patch) | |
| tree | 9bea75fee6c9dc116e0d5e4ee3e6fad600fafcd4 /chrome_frame/urlmon_bind_status_callback.cc | |
| parent | e70313140106d364cb359179773c656c6d84423c (diff) | |
| download | chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.zip chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.tar.gz chromium_src-2b3102bea014c815d42aaf99a97e8da462a6ea5c.tar.bz2 | |
Only switch to cf for text/html. With opt-in URLs we could mark a URL to be loaded in CF regardless of the target mime type. If CF turns around and wants to download the target, we would hit an infinite loop.
TEST=Verify that issue 40046 is resolved. OptIn urls should work with the moniker patch and downloads should not cause an infinite loop.
BUG=40046
Review URL: http://codereview.chromium.org/1715004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/urlmon_bind_status_callback.cc')
| -rw-r--r-- | chrome_frame/urlmon_bind_status_callback.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/urlmon_bind_status_callback.cc b/chrome_frame/urlmon_bind_status_callback.cc index 8d724f4..851edee 100644 --- a/chrome_frame/urlmon_bind_status_callback.cc +++ b/chrome_frame/urlmon_bind_status_callback.cc @@ -234,9 +234,9 @@ STDMETHODIMP BSCBStorageBind::OnDataAvailable(DWORD flags, DWORD size, PlatformThread::CurrentId()); // Do not touch anything other than text/html. - const CLIPFORMAT text_html = RegisterClipboardFormat(CFSTR_MIME_HTML); bool is_interesting = (format_etc && stgmed && stgmed->pstm && - (stgmed->tymed == TYMED_ISTREAM) && (text_html == format_etc->cfFormat)); + stgmed->tymed == TYMED_ISTREAM && + IsTextHtmlClipFormat(format_etc->cfFormat)); if (!is_interesting) { // Play back report progress so far. @@ -332,4 +332,5 @@ HRESULT BSCBStorageBind::MayPlayBack(DWORD flags) { } return hr; -}
\ No newline at end of file +} + |