Changeset 86333 in webkit

Timestamp:

May 12, 2011 6:49:27 AM (13 years ago)

Author:

Nikolas Zimmermann

Message:

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

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/wince/FileSystemWinCE.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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
+
+        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>
 

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

@@ -33 +33 @@
 
 #include "NotImplemented.h"
-#include "PlatformString.h"
 #include <wincrypt.h>
 #include <windows.h>
 #include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -311 +311 @@
             // 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);