2011-05-12 Nikolas Zimmermann <nzimmermann@rim.com>
authorzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2011 13:49:27 +0000 (13:49 +0000)
committerzimmermann@webkit.org <zimmermann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2011 13:49:27 +0000 (13:49 +0000)
        Not reviewed.

        String operator+ reallocates unnecessary when concatting > 2 strings
        https://bugs.webkit.org/show_bug.cgi?id=58420

        Attempt to fix the WinCE build. WinCE/WinCairo still won't link because of unresolved symbols, hmm. If we had EWS for those, I would have caught the problem earlier.

        * platform/wince/FileSystemWinCE.cpp:
        (WebCore::listDirectory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/wince/FileSystemWinCE.cpp

index b1ce5cb..2ec9792 100644 (file)
@@ -5,6 +5,18 @@
         String operator+ reallocates unnecessary when concatting > 2 strings
         https://bugs.webkit.org/show_bug.cgi?id=58420
 
+        Attempt to fix the WinCE build. WinCE/WinCairo still won't link because of unresolved symbols, hmm. If we had EWS for those, I would have caught the problem earlier.
+
+        * platform/wince/FileSystemWinCE.cpp:
+        (WebCore::listDirectory):
+
+2011-05-12  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Not reviewed.
+
+        String operator+ reallocates unnecessary when concatting > 2 strings
+        https://bugs.webkit.org/show_bug.cgi?id=58420
+
         Fix fast/forms/input-image-submit.html regression, seens on the bots - by removing a last-minute typo: s/!!/!/
 
         * html/ImageInputType.cpp:
index 3e28a01..4c7a1df 100644 (file)
 #include "FileSystem.h"
 
 #include "NotImplemented.h"
-#include "PlatformString.h"
 #include <wincrypt.h>
 #include <windows.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -310,7 +310,7 @@ Vector<String> listDirectory(const String& path, const String& filter)
             // is so far only called by PluginDatabase.cpp to list
             // all plugins in a folder, where it's not supposed to list sub-folders.
             if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
-                entries.append(root + findData.cFileName);
+                entries.append(root + String(findData.cFileName));
         } while (FindNextFile(hFind, &findData));
         FindClose(hFind);
     }