Changeset 286752 in webkit

Timestamp:

Dec 8, 2021, 4:32:05 PM (5 years ago)

Author:

don.olmstead@sony.com

Message:

[Win] Remove CF when using Windows clipboard
​https://bugs.webkit.org/show_bug.cgi?id=194876

Reviewed by Brent Fulgham.

Remove any CF code from ClipboardUtilitiesWin and replace it with WTF code. The
urlFromPath function is deleted since it is no longer relevant.

• platform/win/ClipboardUtilitiesWin.cpp:

(WebCore::getURL):
(WebCore::urlFromPath): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/ClipboardUtilitiesWin.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-08  Don Olmstead  <don.olmstead@sony.com>
+
+        [Win] Remove CF when using Windows clipboard
+        https://bugs.webkit.org/show_bug.cgi?id=194876
+
+        Reviewed by Brent Fulgham.
+
+        Remove any CF code from ClipboardUtilitiesWin and replace it with WTF code. The
+        urlFromPath function is deleted since it is no longer relevant.
+
+        * platform/win/ClipboardUtilitiesWin.cpp:
+        (WebCore::getURL):
+        (WebCore::urlFromPath): Deleted.
+
 2021-12-08  Jer Noble  <jer.noble@apple.com>
 

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

@@ -40 +40 @@
 #include <wtf/text/win/WCharStringExtras.h>
 
-#if USE(CF)
-#include <CoreFoundation/CoreFoundation.h>
-#include <wtf/RetainPtr.h>
-#endif
-
 namespace WebCore {
 
@@ -52 +47 @@
     return &urlFormat;
 }
-
-#if USE(CF)
-
-static bool urlFromPath(CFStringRef path, String& url)
-{
-    if (!path)
-        return false;
-
-    RetainPtr<CFURLRef> cfURL = adoptCF(CFURLCreateWithFileSystemPath(0, path, kCFURLWindowsPathStyle, false));
-    if (!cfURL)
-        return false;
-
-    url = CFURLGetString(cfURL.get());
-
-    // Work around <rdar://problem/6708300>, where CFURLCreateWithFileSystemPath makes URLs with "localhost".
-    if (url.startsWith("file://localhost/"))
-        url.remove(7, 9);
-
-    return true;
-}
-#endif
 
 static bool getDataMapItem(const DragDataMap* dataObject, FORMATETC* format, String& item)
@@ -487 +461 @@
         ReleaseStgMedium(&store);
     }
-#if USE(CF)
     else if (filenamePolicy == DragData::ConvertFilenames) {
         if (SUCCEEDED(dataObject->GetData(filenameWFormat(), &store))) {
@@ -493 +466 @@
             wchar_t* data = static_cast<wchar_t*>(GlobalLock(store.hGlobal));
             if (data && data[0] && (PathFileExists(data) || PathIsUNC(data))) {
-                RetainPtr<CFStringRef> pathAsCFString = adoptCF(CFStringCreateWithCharacters(kCFAllocatorDefault, (const UniChar*)data, wcslen(data)));
-                if (urlFromPath(pathAsCFString.get(), url) && title)
+                url = URL::fileURLWithFileSystemPath(String(data)).fileSystemPath();
+                if (title)
                     *title = url;
             }
@@ -503 +476 @@
             char* data = static_cast<char*>(GlobalLock(store.hGlobal));
             if (data && data[0] && (PathFileExistsA(data) || PathIsUNCA(data))) {
-                RetainPtr<CFStringRef> pathAsCFString = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, data, kCFStringEncodingASCII));
-                if (urlFromPath(pathAsCFString.get(), url) && title)
+                url = URL::fileURLWithFileSystemPath(String(data)).fileSystemPath();
+                if (title)
                     *title = url;
             }
@@ -511 +484 @@
         }
     }
-#endif
     return url;
 }
@@ -525 +497 @@
     if (getDataMapItem(data, urlFormat(), url))
         return extractURL(url, title);
-#if USE(CF)
     if (filenamePolicy != DragData::ConvertFilenames)
         return url;
@@ -536 +507 @@
     if (stringData.isEmpty() || (!PathFileExists(wcharData) && !PathIsUNC(wcharData)))
         return url;
-    RetainPtr<CFStringRef> pathAsCFString = adoptCF(CFStringCreateWithCharacters(kCFAllocatorDefault, (const UniChar *)wcharData, wcslen(wcharData)));
-    if (urlFromPath(pathAsCFString.get(), url) && title)
+
+    url = URL::fileURLWithFileSystemPath(stringData).fileSystemPath();
+    if (title)
         *title = url;
-#endif
+
     return url;
 }