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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: webkit/port/platform/chromium/DragImageChromium.cpp
===================================================================
--- webkit/port/platform/chromium/DragImageChromium.cpp (revision 0)
+++ webkit/port/platform/chromium/DragImageChromium.cpp (working copy)
@@ -30,17 +30,26 @@
#include "GraphicsContext.h"
#include "Image.h"
+#if PLATFORM(WIN)
#include <windows.h>
+#endif
namespace WebCore {
IntSize dragImageSize(DragImageRef image)
{
+// TODO(darin): DragImageRef should be changed to be a cross-platform
+// container. However, it may still make sense for its contents to be
+// platform-dependent.
+#if PLATFORM(WIN)
if (!image)
return IntSize();
BITMAP b;
GetObject(image, sizeof(BITMAP), &b);
return IntSize(b.bmWidth, b.bmHeight);
+#else
+ return IntSize();
+#endif
}
void deleteDragImage(DragImageRef image)
Property changes on: webkit\port\platform\chromium\DragImageChromium.cpp
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/platform/DragImageWin.cpp:r69-2775
« 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