[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a065728bf9e8dbc87f44eea2963267ba0ae127d5
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 02:59:51 2010 +0000

    2010-11-03  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Adam Roben.
    
            Port ClipboardWin.cpp to WinCE
            https://bugs.webkit.org/show_bug.cgi?id=48412
    
            * platform/win/ClipboardWin.cpp:
            (WebCore::filesystemPathFromUrlOrTitle):
            (WebCore::createGlobalHDropContent):
            (WebCore::ClipboardWin::files):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71300 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5a81a10..73975a4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Port ClipboardWin.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=48412
+
+        * platform/win/ClipboardWin.cpp:
+        (WebCore::filesystemPathFromUrlOrTitle):
+        (WebCore::createGlobalHDropContent):
+        (WebCore::ClipboardWin::files):
+
 2010-11-03  Vincent Scheib  <scheib at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebCore/platform/win/ClipboardWin.cpp b/WebCore/platform/win/ClipboardWin.cpp
index 4906790..3754090 100644
--- a/WebCore/platform/win/ClipboardWin.cpp
+++ b/WebCore/platform/win/ClipboardWin.cpp
@@ -99,6 +99,7 @@ static inline FORMATETC* fileContentFormatZero()
     return &fileContentFormat;
 }
 
+#if !OS(WINCE)
 static inline void pathRemoveBadFSCharacters(PWSTR psz, size_t length)
 {
     size_t writeTo = 0;
@@ -112,9 +113,14 @@ static inline void pathRemoveBadFSCharacters(PWSTR psz, size_t length)
     }
     psz[writeTo] = 0;
 }
+#endif
 
 static String filesystemPathFromUrlOrTitle(const String& url, const String& title, TCHAR* extension, bool isLink)
 {
+#if OS(WINCE)
+    notImplemented();
+    return String();
+#else
     static const size_t fsPathMaxLengthExcludingNullTerminator = MAX_PATH - 1;
     bool usedURL = false;
     WCHAR fsPathBuffer[MAX_PATH];
@@ -159,6 +165,7 @@ static String filesystemPathFromUrlOrTitle(const String& url, const String& titl
     String result(static_cast<UChar*>(fsPathBuffer));
     result += String(static_cast<UChar*>(extension));
     return result;
+#endif
 }
 
 static HGLOBAL createGlobalImageFileContent(SharedBuffer* data)
@@ -194,6 +201,10 @@ static HGLOBAL createGlobalHDropContent(const KURL& url, String& fileName, Share
         else
             return 0;
     } else {
+#if OS(WINCE)
+        notImplemented();
+        return 0;
+#else
         WCHAR tempPath[MAX_PATH];
         WCHAR extension[MAX_PATH];
         if (!::GetTempPath(ARRAYSIZE(tempPath), tempPath))
@@ -223,6 +234,7 @@ static HGLOBAL createGlobalHDropContent(const KURL& url, String& fileName, Share
         CloseHandle(tempFileHandle);
         if (!tempWriteSucceeded)
             return 0;
+#endif
     }
 
     SIZE_T dropFilesSize = sizeof(DROPFILES) + (sizeof(WCHAR) * (wcslen(filePath) + 2));
@@ -518,6 +530,10 @@ HashSet<String> ClipboardWin::types() const
 
 PassRefPtr<FileList> ClipboardWin::files() const
 {
+#if OS(WINCE)
+    notImplemented();
+    return 0;
+#else
     RefPtr<FileList> files = FileList::create();
     if (policy() != ClipboardReadable && policy() != ClipboardTypesReadable)
         return files.release();
@@ -544,6 +560,7 @@ PassRefPtr<FileList> ClipboardWin::files() const
     GlobalUnlock(medium.hGlobal);
     ReleaseStgMedium(&medium);
     return files.release();
+#endif
 }
 
 void ClipboardWin::setDragImage(CachedImage* image, Node *node, const IntPoint &loc)

-- 
WebKit Debian packaging