diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/win/DragImageCairoWin.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/win/DragImageCairoWin.cpp')
| -rw-r--r-- | WebCore/platform/win/DragImageCairoWin.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/WebCore/platform/win/DragImageCairoWin.cpp b/WebCore/platform/win/DragImageCairoWin.cpp index 1b8fb06..e356575 100644 --- a/WebCore/platform/win/DragImageCairoWin.cpp +++ b/WebCore/platform/win/DragImageCairoWin.cpp @@ -26,6 +26,7 @@ #include "config.h" #include "DragImage.h" +#include "BitmapInfo.h" #include "CachedImage.h" #include "GraphicsContext.h" #include "Image.h" @@ -49,15 +50,7 @@ void deallocContext(CairoContextRef target) HBITMAP allocImage(HDC dc, IntSize size, CairoContextRef* targetRef) { - BITMAPINFO bmpInfo = {0}; - bmpInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmpInfo.bmiHeader.biWidth = size.width(); - bmpInfo.bmiHeader.biHeight = size.height(); // Must be positive! - bmpInfo.bmiHeader.biPlanes = 1; - bmpInfo.bmiHeader.biBitCount = 32; - bmpInfo.bmiHeader.biCompression = BI_RGB; - bmpInfo.bmiHeader.biClrUsed = 0; // unused - bmpInfo.bmiHeader.biClrImportant = 0; + BitmapInfo bmpInfo = BitmapInfo::create(size); LPVOID bits; HBITMAP hbmp = CreateDIBSection(dc, &bmpInfo, DIB_RGB_COLORS, &bits, 0, 0); |