<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286922] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286922">286922</a></dd>
<dt>Author</dt> <dd>don.olmstead@sony.com</dd>
<dt>Date</dt> <dd>2021-12-11 19:04:31 -0800 (Sat, 11 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>SharedBuffer should use WTF::FileSystem when creating from a file
https://bugs.webkit.org/show_bug.cgi?id=233598
<rdar://problem/86123732>

Reviewed by Chris Dumez.

Remove platform specific implementations of SharedBuffer::createFromReadingFile and use
FileSystem::readEntireFile instead when creating a SharedBuffer from a file. The function
was only used within SharedBuffer::createWithContentsOfFile so the implementation is just
moved into that function.

* PlatformFTW.cmake:
* PlatformPlayStation.cmake:
* PlatformWin.cmake:
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::createWithContentsOfFile):
* platform/SharedBuffer.h:
* platform/cocoa/SharedBufferCocoa.mm:
(WebCore::SharedBuffer::createFromReadingFile): Deleted.
* platform/glib/SharedBufferGlib.cpp:
(WebCore::SharedBuffer::createFromReadingFile): Deleted.
* platform/posix/SharedBufferPOSIX.cpp: Removed.
* platform/win/SharedBufferWin.cpp: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformFTWcmake">trunk/Source/WebCore/PlatformFTW.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformPlayStationcmake">trunk/Source/WebCore/PlatformPlayStation.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformWincmake">trunk/Source/WebCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaSharedBufferCocoamm">trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformglibSharedBufferGlibcpp">trunk/Source/WebCore/platform/glib/SharedBufferGlib.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WebCore/platform/posix/</li>
<li><a href="#trunkSourceWebCoreplatformwinSharedBufferWincpp">trunk/Source/WebCore/platform/win/SharedBufferWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/ChangeLog      2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-12-11  Don Olmstead  <don.olmstead@sony.com>
+
+        SharedBuffer should use WTF::FileSystem when creating from a file
+        https://bugs.webkit.org/show_bug.cgi?id=233598
+        <rdar://problem/86123732>
+
+        Reviewed by Chris Dumez.
+
+        Remove platform specific implementations of SharedBuffer::createFromReadingFile and use
+        FileSystem::readEntireFile instead when creating a SharedBuffer from a file. The function
+        was only used within SharedBuffer::createWithContentsOfFile so the implementation is just
+        moved into that function.
+
+        * PlatformFTW.cmake:
+        * PlatformPlayStation.cmake:
+        * PlatformWin.cmake:
+        * platform/SharedBuffer.cpp:
+        (WebCore::SharedBuffer::createWithContentsOfFile):
+        * platform/SharedBuffer.h:
+        * platform/cocoa/SharedBufferCocoa.mm:
+        (WebCore::SharedBuffer::createFromReadingFile): Deleted.
+        * platform/glib/SharedBufferGlib.cpp:
+        (WebCore::SharedBuffer::createFromReadingFile): Deleted.
+        * platform/posix/SharedBufferPOSIX.cpp: Removed.
+        * platform/win/SharedBufferWin.cpp: Removed.
+
</ins><span class="cx"> 2021-12-11  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         ContextDestructionObserver::m_scriptExecutionContext should be private
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformFTWcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformFTW.cmake (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformFTW.cmake   2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/PlatformFTW.cmake      2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -124,7 +124,6 @@
</span><span class="cx">     platform/win/ScrollbarThemeWin.cpp
</span><span class="cx">     platform/win/SearchPopupMenuDB.cpp
</span><span class="cx">     platform/win/SearchPopupMenuWin.cpp
</span><del>-    platform/win/SharedBufferWin.cpp
</del><span class="cx">     platform/win/StructuredExceptionHandlerSuppressor.cpp
</span><span class="cx">     platform/win/SystemInfo.cpp
</span><span class="cx">     platform/win/UserAgentWin.cpp
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformPlayStationcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformPlayStation.cmake (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformPlayStation.cmake   2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/PlatformPlayStation.cmake      2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -58,8 +58,6 @@
</span><span class="cx">     platform/playstation/UserAgentPlayStation.cpp
</span><span class="cx">     platform/playstation/WidgetPlayStation.cpp
</span><span class="cx"> 
</span><del>-    platform/posix/SharedBufferPOSIX.cpp
-
</del><span class="cx">     platform/text/Hyphenation.cpp
</span><span class="cx">     platform/text/LocaleICU.cpp
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformWin.cmake (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformWin.cmake   2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/PlatformWin.cmake      2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx">     platform/win/ScrollbarThemeWin.cpp
</span><span class="cx">     platform/win/SearchPopupMenuDB.cpp
</span><span class="cx">     platform/win/SearchPopupMenuWin.cpp
</span><del>-    platform/win/SharedBufferWin.cpp
</del><span class="cx">     platform/win/SystemInfo.cpp
</span><span class="cx">     platform/win/UserAgentWin.cpp
</span><span class="cx">     platform/win/WCDataObject.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp   2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp      2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -85,7 +85,12 @@
</span><span class="cx">         if (mappingSuccess)
</span><span class="cx">             return adoptRef(new SharedBuffer(WTFMove(mappedFileData)));
</span><span class="cx">     }
</span><del>-    return SharedBuffer::createFromReadingFile(filePath);
</del><ins>+
+    auto buffer = FileSystem::readEntireFile(filePath);
+    if (!buffer)
+        return nullptr;
+
+    return SharedBuffer::create(WTFMove(*buffer));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Ref<SharedBuffer> SharedBuffer::create(Vector<uint8_t>&& vector)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h     2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/platform/SharedBuffer.h        2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -248,8 +248,6 @@
</span><span class="cx"> 
</span><span class="cx">     const DataSegmentVectorEntry* getSegmentForPosition(size_t positition) const;
</span><span class="cx"> 
</span><del>-    static RefPtr<SharedBuffer> createFromReadingFile(const String& filePath);
-
</del><span class="cx">     size_t m_size { 0 };
</span><span class="cx">     mutable DataSegmentVector m_segments;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaSharedBufferCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm 2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/platform/cocoa/SharedBufferCocoa.mm    2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -112,13 +112,6 @@
</span><span class="cx">     return bridge_cast(m_segments[0].segment->createNSData());
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<SharedBuffer> SharedBuffer::createFromReadingFile(const String& filePath)
-{
-    if (auto resourceData = [NSData dataWithContentsOfFile:filePath])
-        return SharedBuffer::create(resourceData);
-    return nullptr;
-}
-
</del><span class="cx"> RetainPtr<NSArray> SharedBuffer::createNSDataArray() const
</span><span class="cx"> {
</span><span class="cx">     return createNSArray(m_segments, [] (auto& segment) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformglibSharedBufferGlibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/glib/SharedBufferGlib.cpp (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/SharedBufferGlib.cpp  2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/platform/glib/SharedBufferGlib.cpp     2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -47,21 +47,4 @@
</span><span class="cx">     return bytes;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-RefPtr<SharedBuffer> SharedBuffer::createFromReadingFile(const String& filePath)
-{
-    if (filePath.isEmpty())
-        return nullptr;
-
-    CString filename = FileSystem::fileSystemRepresentation(filePath);
-    GUniqueOutPtr<gchar> contents;
-    gsize size;
-    GUniqueOutPtr<GError> error;
-    if (!g_file_get_contents(filename.data(), &contents.outPtr(), &size, &error.outPtr())) {
-        LOG_ERROR("Failed to fully read contents of file %s - %s", FileSystem::filenameForDisplay(filePath).utf8().data(), error->message);
-        return nullptr;
-    }
-
-    return SharedBuffer::create(contents.get(), size);
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinSharedBufferWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/win/SharedBufferWin.cpp (286921 => 286922)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/SharedBufferWin.cpp    2021-12-12 02:08:20 UTC (rev 286921)
+++ trunk/Source/WebCore/platform/win/SharedBufferWin.cpp       2021-12-12 03:04:31 UTC (rev 286922)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission. 
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SharedBuffer.h"
-#include <wtf/text/CString.h>
-
-namespace WebCore {
-
-RefPtr<SharedBuffer> SharedBuffer::createFromReadingFile(const String& filePath)
-{
-    if (filePath.isEmpty())
-        return nullptr;
-
-    String nullifiedPath = filePath;
-    HANDLE fileHandle = CreateFileW(nullifiedPath.wideCharacters().data(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
-    if (fileHandle == INVALID_HANDLE_VALUE) {
-        LOG_ERROR("Failed to open file %s to create shared buffer, GetLastError() = %u", filePath.ascii().data(), GetLastError());
-        return nullptr;
-    }
-
-    RefPtr<SharedBuffer> result;
-    DWORD bytesToRead = GetFileSize(fileHandle, 0);
-    DWORD lastError = GetLastError();
-
-    if (bytesToRead != INVALID_FILE_SIZE || lastError == NO_ERROR) {
-        Vector<uint8_t> buffer(bytesToRead);
-        DWORD bytesRead;
-        if (ReadFile(fileHandle, buffer.data(), bytesToRead, &bytesRead, 0) && bytesToRead == bytesRead)
-            result = SharedBuffer::create(WTFMove(buffer));
-        else
-            LOG_ERROR("Failed to fully read contents of file %s, GetLastError() = %u", filePath.ascii().data(), GetLastError());
-    } else
-        LOG_ERROR("Failed to get filesize of file %s, GetLastError() = %u", filePath.ascii().data(), lastError);
-
-    CloseHandle(fileHandle);
-    return result;
-}
-
-} // namespace WebCore
</del></span></pre>
</div>
</div>

</body>
</html>