Title: [202189] trunk/Source/WebCore
- Revision
- 202189
- Author
- [email protected]
- Date
- 2016-06-17 18:02:43 -0700 (Fri, 17 Jun 2016)
Log Message
Unreviewed, rolling out r202187.
202186
Reverted changeset:
"Unreviewed clean-up after r202186."
http://trac.webkit.org/changeset/202187
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202188 => 202189)
--- trunk/Source/WebCore/ChangeLog 2016-06-18 00:25:44 UTC (rev 202188)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 01:02:43 UTC (rev 202189)
@@ -1,3 +1,14 @@
+2016-06-17 Daniel Bates <[email protected]>
+
+ Unreviewed, rolling out r202187.
+
+ 202186
+
+ Reverted changeset:
+
+ "Unreviewed clean-up after r202186."
+ http://trac.webkit.org/changeset/202187
+
2016-06-17 Chris Dumez <[email protected]>
Optimize parseCacheHeader() by using StringView
Modified: trunk/Source/WebCore/platform/FileSystem.cpp (202188 => 202189)
--- trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 00:25:44 UTC (rev 202188)
+++ trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 01:02:43 UTC (rev 202189)
@@ -330,18 +330,19 @@
bool filesHaveSameVolume(const String& sourceFile, const String& destFile)
{
+ CString fsRepSourceFile, fsRepDestFile;
+ PlatformStat sourceFileStat, destFileStat;
+ PlatformFileHandle sourceHandle = -1, destHandle = -1;
+ bool result = true;
- auto fsRepSourceFile = fileSystemRepresentation(sourceFile);
- auto fsRepDestFile = fileSystemRepresentation(destFile);
+ fsRepSourceFile = fileSystemRepresentation(sourceFile);
+ fsRepDestFile = fileSystemRepresentation(destFile);
- PlatformFileHandle sourceHandle = -1, destHandle = -1;
if (!fsRepSourceFile.isNull() && !fsRepDestFile.isNull()) {
sourceHandle = openFile(fsRepSourceFile.data(), OpenForRead);
destHandle = openFile(fsRepDestFile.data(), OpenForRead);
}
- bool result = true;
- PlatformStat sourceFileStat, destFileStat;
if (sourceHandle > -1 && destHandle > -1) {
if (platformFileStat(sourceHandle, &sourceFileStat) > -1 && platformFileStat(destHandle, &destFileStat) > -1) {
if (sourceFileStat.st_dev != destFileStat.st_dev)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
