diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 20:32:46 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 20:32:46 +0000 |
| commit | 48e6bb66ca6e49d11d71ccc28e4b6d8ccac42765 (patch) | |
| tree | ee05a2e50a279177bcd93680fb1ee109dafb9e7c /chrome_frame | |
| parent | 23c1beb39a421b4f78e95dca866c5a06d523dd08 (diff) | |
| download | chromium_src-48e6bb66ca6e49d11d71ccc28e4b6d8ccac42765.zip chromium_src-48e6bb66ca6e49d11d71ccc28e4b6d8ccac42765.tar.gz chromium_src-48e6bb66ca6e49d11d71ccc28e4b6d8ccac42765.tar.bz2 | |
CRLF->LF
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_activex_base.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 7a1993a..bfdabb0 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -191,17 +191,17 @@ END_MSG_MAP() // IViewObjectEx DECLARE_VIEW_STATUS(VIEWSTATUS_SOLIDBKGND | VIEWSTATUS_OPAQUE) - inline HRESULT IViewObject_Draw(DWORD draw_aspect, LONG index,
- void* aspect_info, DVTARGETDEVICE* ptd, HDC info_dc, HDC dc,
- LPCRECTL bounds, LPCRECTL win_bounds) {
- // ATL ASSERTs if dwDrawAspect is DVASPECT_DOCPRINT, so we cheat.
- DWORD aspect = draw_aspect;
- if (aspect == DVASPECT_DOCPRINT)
- aspect = DVASPECT_CONTENT;
-
- return CComControl<T>::IViewObject_Draw(aspect, index, aspect_info, ptd,
- info_dc, dc, bounds, win_bounds);
- }
+ inline HRESULT IViewObject_Draw(DWORD draw_aspect, LONG index, + void* aspect_info, DVTARGETDEVICE* ptd, HDC info_dc, HDC dc, + LPCRECTL bounds, LPCRECTL win_bounds) { + // ATL ASSERTs if dwDrawAspect is DVASPECT_DOCPRINT, so we cheat. + DWORD aspect = draw_aspect; + if (aspect == DVASPECT_DOCPRINT) + aspect = DVASPECT_CONTENT; + + return CComControl<T>::IViewObject_Draw(aspect, index, aspect_info, ptd, + info_dc, dc, bounds, win_bounds); + } DECLARE_PROTECT_FINAL_CONSTRUCT() |