Title: [221612] trunk/Source
- Revision
- 221612
- Author
- [email protected]
- Date
- 2017-09-05 01:20:09 -0700 (Tue, 05 Sep 2017)
Log Message
[Win] Fix the wincairo build after r221558 and r221583
https://bugs.webkit.org/show_bug.cgi?id=176353
Patch by Yoshiaki Jitsukawa <[email protected]> on 2017-09-05
Reviewed by Yusuke Suzuki.
Source/WebCore:
* platform/win/FileSystemWin.cpp:
(WebCore::isSymbolicLink): Fix a "missing type specifier" error
(WebCore::findDataToFileMetadata): Fix a narrowing convertion error
Source/WTF:
* wtf/Assertions.cpp:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (221611 => 221612)
--- trunk/Source/WTF/ChangeLog 2017-09-05 08:17:25 UTC (rev 221611)
+++ trunk/Source/WTF/ChangeLog 2017-09-05 08:20:09 UTC (rev 221612)
@@ -1,3 +1,12 @@
+2017-09-05 Yoshiaki Jitsukawa <[email protected]>
+
+ [Win] Fix the wincairo build after r221558 and r221583
+ https://bugs.webkit.org/show_bug.cgi?id=176353
+
+ Reviewed by Yusuke Suzuki.
+
+ * wtf/Assertions.cpp:
+
2017-09-04 Eric Carlson <[email protected]>
Switch HTMLMediaElement to release logging
Modified: trunk/Source/WTF/wtf/Assertions.cpp (221611 => 221612)
--- trunk/Source/WTF/wtf/Assertions.cpp 2017-09-05 08:17:25 UTC (rev 221611)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2017-09-05 08:20:09 UTC (rev 221612)
@@ -132,8 +132,8 @@
Vector<char> buffer(size);
do {
buffer.grow(size);
- if (vsnprintf(buffer.get(), size, format, args) != -1) {
- OutputDebugStringA(buffer.get());
+ if (vsnprintf(buffer.data(), size, format, args) != -1) {
+ OutputDebugStringA(buffer.data());
break;
}
size *= 2;
Modified: trunk/Source/WebCore/ChangeLog (221611 => 221612)
--- trunk/Source/WebCore/ChangeLog 2017-09-05 08:17:25 UTC (rev 221611)
+++ trunk/Source/WebCore/ChangeLog 2017-09-05 08:20:09 UTC (rev 221612)
@@ -1,3 +1,14 @@
+2017-09-05 Yoshiaki Jitsukawa <[email protected]>
+
+ [Win] Fix the wincairo build after r221558 and r221583
+ https://bugs.webkit.org/show_bug.cgi?id=176353
+
+ Reviewed by Yusuke Suzuki.
+
+ * platform/win/FileSystemWin.cpp:
+ (WebCore::isSymbolicLink): Fix a "missing type specifier" error
+ (WebCore::findDataToFileMetadata): Fix a narrowing convertion error
+
2017-09-04 Chris Dumez <[email protected]>
Use StringView more in DOMFileSystem code
Modified: trunk/Source/WebCore/platform/win/FileSystemWin.cpp (221611 => 221612)
--- trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2017-09-05 08:17:25 UTC (rev 221611)
+++ trunk/Source/WebCore/platform/win/FileSystemWin.cpp 2017-09-05 08:20:09 UTC (rev 221612)
@@ -158,7 +158,7 @@
return String::adopt(WTFMove(buffer));
}
-static inline isSymbolicLink(WIN32_FIND_DATAW findData)
+static inline bool isSymbolicLink(WIN32_FIND_DATAW findData)
{
return findData.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT && findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK;
}
@@ -184,7 +184,7 @@
return FileMetadata {
static_cast<double>(modificationTime),
length,
- findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN,
+ static_cast<bool>(findData.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN),
toFileMetadataType(findData)
};
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
