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

Side by Side Diff: webkit/port/platform/chromium/DragImageChromium.cpp

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 | Annotate | Revision Log
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/DragImageWin.cpp:r69-2775
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "DragImage.h" 27 #include "DragImage.h"
28 28
29 #include "CachedImage.h" 29 #include "CachedImage.h"
30 #include "GraphicsContext.h" 30 #include "GraphicsContext.h"
31 #include "Image.h" 31 #include "Image.h"
32 32
33 #if PLATFORM(WIN)
33 #include <windows.h> 34 #include <windows.h>
35 #endif
34 36
35 namespace WebCore { 37 namespace WebCore {
36 38
37 IntSize dragImageSize(DragImageRef image) 39 IntSize dragImageSize(DragImageRef image)
38 { 40 {
41 // TODO(darin): DragImageRef should be changed to be a cross-platform
42 // container. However, it may still make sense for its contents to be
43 // platform-dependent.
44 #if PLATFORM(WIN)
39 if (!image) 45 if (!image)
40 return IntSize(); 46 return IntSize();
41 BITMAP b; 47 BITMAP b;
42 GetObject(image, sizeof(BITMAP), &b); 48 GetObject(image, sizeof(BITMAP), &b);
43 return IntSize(b.bmWidth, b.bmHeight); 49 return IntSize(b.bmWidth, b.bmHeight);
50 #else
51 return IntSize();
52 #endif
44 } 53 }
45 54
46 void deleteDragImage(DragImageRef image) 55 void deleteDragImage(DragImageRef image)
47 { 56 {
48 if (image) 57 if (image)
49 ::DeleteObject(image); 58 ::DeleteObject(image);
50 } 59 }
51 60
52 DragImageRef scaleDragImage(DragImageRef image, FloatSize scale) 61 DragImageRef scaleDragImage(DragImageRef image, FloatSize scale)
53 { 62 {
(...skipping 13 matching lines...) Expand all
67 return 0; 76 return 0;
68 } 77 }
69 78
70 DragImageRef createDragImageIconForCachedImage(CachedImage*) 79 DragImageRef createDragImageIconForCachedImage(CachedImage*)
71 { 80 {
72 //FIXME: Provide icon for image type <rdar://problem/5015949> 81 //FIXME: Provide icon for image type <rdar://problem/5015949>
73 return 0; 82 return 0;
74 } 83 }
75 84
76 } 85 }
OLDNEW
« no previous file with comments | « webkit/port/platform/chromium/DragDataChromium.cpp ('k') | webkit/port/platform/chromium/FileChooserChromium.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698