Changeset 79119 in webkit

Timestamp:

Feb 19, 2011 6:38:11 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-02-19 Patrick Gansterer <Patrick Gansterer>

Reviewed by Andreas Kling.

Make FileChooserWin.cpp more portable and use it on WinCE
​https://bugs.webkit.org/show_bug.cgi?id=54803

• CMakeListsWinCE.txt:
• platform/win/FileChooserWin.cpp: (WebCore::FileChooser::basenameForWidth):
• platform/wince/FileChooserWinCE.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• CMakeListsWinCE.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• platform/win/FileChooserWin.cpp (modified) (2 diffs)
• platform/wince/FileChooserWinCE.cpp (deleted)

trunk/Source/WebCore/CMakeListsWinCE.txt

@@ -46 +46 @@
     platform/win/EditorWin.cpp
     platform/win/EventLoopWin.cpp
+    platform/win/FileChooserWin.cpp
     platform/win/KeyEventWin.cpp
     platform/win/LanguageWin.cpp
@@ -65 +66 @@
     platform/wince/DragDataWince.cpp
     platform/wince/DragImageWince.cpp
-    platform/wince/FileChooserWince.cpp
     platform/wince/FileSystemWince.cpp
     platform/wince/KeygenWince.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-19  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Make FileChooserWin.cpp more portable and use it on WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=54803
+
+        * CMakeListsWinCE.txt:
+        * platform/win/FileChooserWin.cpp:
+        (WebCore::FileChooser::basenameForWidth):
+        * platform/wince/FileChooserWinCE.cpp: Removed.
+
 2011-02-19  James Simonsen  <simonjam@chromium.org>
 

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

@@ -27 +27 @@
 #include "FileChooser.h"
 
+#include "FileSystem.h"
 #include "LocalizedStrings.h"
 #include "StringTruncator.h"
-#include <shlwapi.h>
-#include <windows.h>
 
 namespace WebCore {
@@ -42 +41 @@
     if (m_filenames.isEmpty())
         string = fileButtonNoFileSelectedLabel();
-    else if (m_filenames.size() == 1) {
-        String tmpFilename = m_filenames[0];
-        LPWSTR basename = PathFindFileNameW(tmpFilename.charactersWithNullTermination());
-        string = String(basename);
-    } else
+    else if (m_filenames.size() == 1)
+        string = pathGetFileName(m_filenames[0]);
+    else
         return StringTruncator::rightTruncate(String::number(m_filenames.size()) + " files", width, font);