Title: [149280] trunk/Source/WebCore
- Revision
- 149280
- Author
- [email protected]
- Date
- 2013-04-29 07:26:09 -0700 (Mon, 29 Apr 2013)
Log Message
[WIN] Guard cfHDropFormat() with USE(CF) instead of OS(WINCE)
https://bugs.webkit.org/show_bug.cgi?id=115195
Reviewed by Andreas Kling.
USE(CF) is the correct guard, which works on desktop pcs too.
* platform/win/ClipboardWin.cpp:
(WebCore::ClipboardWin::files):
* platform/win/DragDataWin.cpp:
(WebCore::DragData::containsFiles):
(WebCore::DragData::numberOfFiles):
(WebCore::DragData::asFilenames):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149279 => 149280)
--- trunk/Source/WebCore/ChangeLog 2013-04-29 14:16:20 UTC (rev 149279)
+++ trunk/Source/WebCore/ChangeLog 2013-04-29 14:26:09 UTC (rev 149280)
@@ -1,3 +1,19 @@
+2013-04-29 Patrick Gansterer <[email protected]>
+
+ [WIN] Guard cfHDropFormat() with USE(CF) instead of OS(WINCE)
+ https://bugs.webkit.org/show_bug.cgi?id=115195
+
+ Reviewed by Andreas Kling.
+
+ USE(CF) is the correct guard, which works on desktop pcs too.
+
+ * platform/win/ClipboardWin.cpp:
+ (WebCore::ClipboardWin::files):
+ * platform/win/DragDataWin.cpp:
+ (WebCore::DragData::containsFiles):
+ (WebCore::DragData::numberOfFiles):
+ (WebCore::DragData::asFilenames):
+
2013-04-29 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.cpp (149279 => 149280)
--- trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-04-29 14:16:20 UTC (rev 149279)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-04-29 14:26:09 UTC (rev 149280)
@@ -535,10 +535,7 @@
PassRefPtr<FileList> ClipboardWin::files() const
{
-#if OS(WINCE)
- notImplemented();
- return 0;
-#else
+#if USE(CF)
RefPtr<FileList> files = FileList::create();
if (!canReadData())
return files.release();
@@ -573,6 +570,9 @@
for (Vector<String>::iterator it = filesVector.begin(); it != filesVector.end(); ++it)
files->append(File::create(*it));
return files.release();
+#else
+ notImplemented();
+ return 0;
#endif
}
Modified: trunk/Source/WebCore/platform/win/DragDataWin.cpp (149279 => 149280)
--- trunk/Source/WebCore/platform/win/DragDataWin.cpp 2013-04-29 14:16:20 UTC (rev 149279)
+++ trunk/Source/WebCore/platform/win/DragDataWin.cpp 2013-04-29 14:26:09 UTC (rev 149280)
@@ -108,18 +108,16 @@
bool DragData::containsFiles() const
{
-#if OS(WINCE)
+#if USE(CF)
+ return (m_platformDragData) ? SUCCEEDED(m_platformDragData->QueryGetData(cfHDropFormat())) : m_dragDataMap.contains(cfHDropFormat()->cfFormat);
+#else
return false;
-#else
- return (m_platformDragData) ? SUCCEEDED(m_platformDragData->QueryGetData(cfHDropFormat())) : m_dragDataMap.contains(cfHDropFormat()->cfFormat);
#endif
}
unsigned DragData::numberOfFiles() const
{
-#if OS(WINCE)
- return 0;
-#else
+#if USE(CF)
if (!m_platformDragData)
return 0;
@@ -138,12 +136,14 @@
GlobalUnlock(medium.hGlobal);
return numFiles;
+#else
+ return 0;
#endif
}
void DragData::asFilenames(Vector<String>& result) const
{
-#if !OS(WINCE)
+#if USE(CF)
if (m_platformDragData) {
WCHAR filename[MAX_PATH];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
