Changeset 286708 in webkit

Timestamp:

Dec 8, 2021, 12:46:39 PM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[Win] WebCore::cfHDropFormat implementation is not CF specific
​https://bugs.webkit.org/show_bug.cgi?id=234021

Reviewed by Alex Christensen.

The implementation of cfHDropFormat was guarded by USE(CF) but there is nothing CF specific
about the implementation. Drop the guards around it and any of its callers.

Renaming CFData functions to HDropData to better represent the underlying Windows type for
the clipboard and make sure its not mistaken for CoreFoundation functionality.

• platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::getWebLocData):
(WebCore::getHDropData):
(WebCore::setHDropData):
(WebCore::getClipboardMap):
(WebCore::getCFData): Deleted.
(WebCore::setCFData): Deleted.

• platform/win/DragDataWin.cpp:

(WebCore::DragData::containsFiles const):
(WebCore::DragData::numberOfFiles const):
(WebCore::DragData::asFilenames const):

• platform/win/PasteboardWin.cpp:

(WebCore::Pasteboard::read):
(WebCore::writeFileToDataObject):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/ClipboardUtilitiesWin.cpp (modified) (11 diffs)
• platform/win/DragDataWin.cpp (modified) (4 diffs)
• platform/win/PasteboardWin.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-08  Don Olmstead  <don.olmstead@sony.com>
+
+        [Win] WebCore::cfHDropFormat implementation is not CF specific
+        https://bugs.webkit.org/show_bug.cgi?id=234021
+
+        Reviewed by Alex Christensen.
+
+        The implementation of cfHDropFormat was guarded by USE(CF) but there is nothing CF specific
+        about the implementation. Drop the guards around it and any of its callers.
+
+        Renaming CFData functions to HDropData to better represent the underlying Windows type for
+        the clipboard and make sure its not mistaken for CoreFoundation functionality.
+
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::getWebLocData):
+        (WebCore::getHDropData):
+        (WebCore::setHDropData):
+        (WebCore::getClipboardMap):
+        (WebCore::getCFData): Deleted.
+        (WebCore::setCFData): Deleted.
+        * platform/win/DragDataWin.cpp:
+        (WebCore::DragData::containsFiles const):
+        (WebCore::DragData::numberOfFiles const):
+        (WebCore::DragData::asFilenames const):
+        * platform/win/PasteboardWin.cpp:
+        (WebCore::Pasteboard::read):
+        (WebCore::writeFileToDataObject):
+
 2021-12-08  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/WebCore/platform/win/ClipboardUtilitiesWin.cpp

@@ -47 +47 @@
 namespace WebCore {
 
-#if USE(CF)
 FORMATETC* cfHDropFormat()
 {
@@ -53 +52 @@
     return &urlFormat;
 }
+
+#if USE(CF)
 
 static bool urlFromPath(CFStringRef path, String& url)
@@ -85 +86 @@
 {
     bool succeeded = false;
-#if USE(CF)
     WCHAR filename[MAX_PATH];
     WCHAR urlBuffer[INTERNET_MAX_URL_LENGTH];
@@ -119 +119 @@
     DragFinish(hdrop);
     GlobalUnlock(medium.hGlobal);
-#endif
     return succeeded;
 }
@@ -125 +124 @@
 static bool getWebLocData(const DragDataMap* dataObject, String& url, String* title) 
 {
-#if USE(CF)
     WCHAR filename[MAX_PATH];
     WCHAR urlBuffer[INTERNET_MAX_URL_LENGTH];
@@ -146 +144 @@
     url = String(urlBuffer);
     return true;
-#else
-    return false;
-#endif
 }
 
@@ -740 +735 @@
 }
 
-#if USE(CF)
-void getCFData(IDataObject* data, FORMATETC* format, Vector<String>& dataStrings)
+void getHDropData(IDataObject* data, FORMATETC* format, Vector<String>& dataStrings)
 {
     STGMEDIUM store;
@@ -762 +756 @@
     ReleaseStgMedium(&store);
 }
-#endif
 
 // Setter functions.
@@ -796 +789 @@
 }
 
-#if USE(CF)
-void setCFData(IDataObject* data, FORMATETC* format, const Vector<String>& dataStrings)
+void setHDropData(IDataObject* data, FORMATETC* format, const Vector<String>& dataStrings)
 {
     STGMEDIUM medium { };
@@ -816 +808 @@
     ::GlobalFree(medium.hGlobal);
 }
-#endif
 
 static const ClipboardFormatMap& getClipboardMap()
@@ -826 +817 @@
         formatMap.add(plainTextFormat()->cfFormat,  new ClipboardDataItem(plainTextFormat(), getStringData<char>, setUtf8Data));
         formatMap.add(plainTextWFormat()->cfFormat,  new ClipboardDataItem(plainTextWFormat(), getStringData<UChar>, setUCharData));
-#if USE(CF)
-        formatMap.add(cfHDropFormat()->cfFormat,  new ClipboardDataItem(cfHDropFormat(), getCFData, setCFData));
-#endif
+        formatMap.add(cfHDropFormat()->cfFormat,  new ClipboardDataItem(cfHDropFormat(), getHDropData, setHDropData));
         formatMap.add(filenameFormat()->cfFormat,  new ClipboardDataItem(filenameFormat(), getStringData<char>, setUtf8Data));
         formatMap.add(filenameWFormat()->cfFormat,  new ClipboardDataItem(filenameWFormat(), getStringData<UChar>, setUCharData));

trunk/Source/WebCore/platform/win/DragDataWin.cpp

@@ -104 +104 @@
 bool DragData::containsFiles() const
 {
-#if USE(CF)
     return (m_platformDragData) ? SUCCEEDED(m_platformDragData->QueryGetData(cfHDropFormat())) : m_dragDataMap.contains(cfHDropFormat()->cfFormat);
-#else
-    return false;
-#endif
 }
 
 unsigned DragData::numberOfFiles() const
 {
-#if USE(CF)
     if (!m_platformDragData)
         return 0;
@@ -132 +127 @@
 
     return numFiles;
-#else
-    return 0;
-#endif
 }
 
@@ -141 +133 @@
     Vector<String> result;
 
-#if USE(CF)
     if (m_platformDragData) {
         WCHAR filename[MAX_PATH];
@@ -168 +159 @@
     }
     result = m_dragDataMap.get(cfHDropFormat()->cfFormat);
-#endif
 
     return result;

trunk/Source/WebCore/platform/win/PasteboardWin.cpp

@@ -372 +372 @@
 void Pasteboard::read(PasteboardFileReader& reader, std::optional<size_t>)
 {
-#if USE(CF)
     if (m_dataObject) {
         STGMEDIUM medium;
@@ -400 +399 @@
     for (auto& filename : list->value)
         reader.readFilename(filename);
-#else
-    UNUSED_PARAM(reader);
-    notImplemented();
-    return;
-#endif
 }
 
@@ -672 +666 @@
         goto exit;
 
-#if USE(CF)
     // HDROP
     if (hDropContent) {
@@ -678 +671 @@
         hr = dataObject->SetData(cfHDropFormat(), &medium, TRUE);
     }
-#endif
 
 exit: