Title: [210602] trunk/Source/WebCore
- Revision
- 210602
- Author
- [email protected]
- Date
- 2017-01-11 15:07:39 -0800 (Wed, 11 Jan 2017)
Log Message
[GTK] Unreviewed build fix after r210599.
* platform/glib/FileSystemGlib.cpp:
(WebCore::getFileDeviceId): Revise for new signature.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210601 => 210602)
--- trunk/Source/WebCore/ChangeLog 2017-01-11 23:06:13 UTC (rev 210601)
+++ trunk/Source/WebCore/ChangeLog 2017-01-11 23:07:39 UTC (rev 210602)
@@ -1,3 +1,10 @@
+2017-01-11 Brent Fulgham <[email protected]>
+
+ [GTK] Unreviewed build fix after r210599.
+
+ * platform/glib/FileSystemGlib.cpp:
+ (WebCore::getFileDeviceId): Revise for new signature.
+
2017-01-11 Myles C. Maxfield <[email protected]>
ASSERTION FAILED: run->m_stop > 0 in *WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment
Modified: trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp (210601 => 210602)
--- trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp 2017-01-11 23:06:13 UTC (rev 210601)
+++ trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp 2017-01-11 23:07:39 UTC (rev 210602)
@@ -408,12 +408,14 @@
#endif
}
-std::optional<int32_t> getFileDeviceId(PlatformFileHandle handle)
+std::optional<int32_t> getFileDeviceId(const CString& fsFile)
{
- if (!isHandleValid(handle))
+ GUniquePtr<gchar> filename = unescapedFilename(fsFile);
+ if (!filename)
return std::nullopt;
- GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_io_stream_query_info(handle, G_FILE_ATTRIBUTE_UNIX_DEVICE, nullptr, nullptr));
+ GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(filename.get()));
+ GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_io_stream_query_info(file.get(), G_FILE_ATTRIBUTE_UNIX_DEVICE, nullptr, nullptr));
if (!fileInfo)
return std::nullopt;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
