[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 16:38:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 10362228903817364f83c888cf742e0d59815750
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 29 17:52:57 2010 +0000
2010-11-29 Patrick Gansterer <paroga at webkit.org>
Reviewed by Adam Roben.
Simplify directoryName in FileSystemWin.cpp
https://bugs.webkit.org/show_bug.cgi?id=50028
* platform/win/FileSystemWin.cpp:
(WebCore::directoryName):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72808 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 65611db..991a09d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-29 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Adam Roben.
+
+ Simplify directoryName in FileSystemWin.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=50028
+
+ * platform/win/FileSystemWin.cpp:
+ (WebCore::directoryName):
+
2010-11-24 Dimitri Glazkov <dglazkov at chromium.org>
Reviewed by Darin Adler.
diff --git a/WebCore/platform/win/FileSystemWin.cpp b/WebCore/platform/win/FileSystemWin.cpp
index cef7196..5ee3b8e 100644
--- a/WebCore/platform/win/FileSystemWin.cpp
+++ b/WebCore/platform/win/FileSystemWin.cpp
@@ -134,10 +134,7 @@ String pathGetFileName(const String& path)
String directoryName(const String& path)
{
- String fileName = pathGetFileName(path);
- String dirName = String(path);
- dirName.truncate(dirName.length() - pathGetFileName(path).length());
- return dirName;
+ return path.left(path.length() - pathGetFileName(path).length());
}
static String bundleName()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list