Diff
Modified: trunk/Source/WebCore/ChangeLog (263829 => 263830)
--- trunk/Source/WebCore/ChangeLog 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/ChangeLog 2020-07-02 03:08:57 UTC (rev 263830)
@@ -1,3 +1,51 @@
+2020-07-01 Said Abou-Hallawa <[email protected]>
+
+ Allow the File object to be created with a replacement file
+ https://bugs.webkit.org/show_bug.cgi?id=213825
+
+ Reviewed by Darin Adler.
+
+ Working towards webkit.org/b/213347, it needs to be possible to create
+ the File object with an optional replacement file. Only the registered
+ BlobDataFileReference will be created with both the original file path
+ and the replacement file path. So it can delete the replacement file when
+ it is destroyed. Otherwise BlobDataFileReference will be created with the
+ replacement file path.
+
+ It is important to create the File object with the replacement file because
+ it needs to get the meta-data and the bytes of the replacement file not
+ the original file.
+
+ * fileapi/File.cpp:
+ (WebCore::File::create):
+ * fileapi/File.h:
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::ThreadableBlobRegistry::registerFileBlobURL):
+ * fileapi/ThreadableBlobRegistry.h:
+ * html/DirectoryFileListCreator.cpp:
+ (WebCore::createFileList):
+ * html/FileInputType.cpp:
+ (WebCore::FileInputType::filesFromFormControlState):
+ When the Files are created from a FormControlState, they will be created
+ without replacement files since they might have been deleted.
+
+ (WebCore::FileInputType::filesChosen):
+ (WebCore::FileInputType::receiveDroppedFiles):
+ * platform/FileChooser.cpp:
+ (WebCore::FileChooser::chooseFiles):
+ (WebCore::FileChooser::chooseMediaFiles):
+ * platform/FileChooser.h:
+ (WebCore::FileChooserFileInfo::isolatedCopy const):
+ (WebCore::FileChooser::chooseFiles):
+ (WebCore::FileChooserFileInfo::FileChooserFileInfo): Deleted.
+ * platform/network/BlobDataFileReference.cpp:
+ (WebCore::BlobDataFileReference::BlobDataFileReference):
+ (WebCore::BlobDataFileReference::~BlobDataFileReference):
+ (WebCore::BlobDataFileReference::path):
+ (WebCore::BlobDataFileReference::startTrackingModifications):
+ * platform/network/BlobDataFileReference.h:
+ * platform/network/BlobRegistry.h:
+
2020-07-01 Don Olmstead <[email protected]>
[CMake] Add WOFF2 targets
Modified: trunk/Source/WebCore/fileapi/File.cpp (263829 => 263830)
--- trunk/Source/WebCore/fileapi/File.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/fileapi/File.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -46,16 +46,17 @@
return file;
}
-Ref<File> File::create(const String& path, const String& nameOverride)
+Ref<File> File::create(const String& path, const String& replacementPath, const String& nameOverride)
{
String name;
String type;
- computeNameAndContentType(path, nameOverride, name, type);
+ String effectivePath = !replacementPath.isNull() ? replacementPath : path;
+ computeNameAndContentType(effectivePath, nameOverride, name, type);
auto internalURL = BlobURL::createInternalURL();
- ThreadableBlobRegistry::registerFileBlobURL(internalURL, path, type);
+ ThreadableBlobRegistry::registerFileBlobURL(internalURL, path, replacementPath, type);
- return adoptRef(*new File(WTFMove(internalURL), WTFMove(type), String { path }, WTFMove(name)));
+ return adoptRef(*new File(WTFMove(internalURL), WTFMove(type), WTFMove(effectivePath), WTFMove(name)));
}
File::File(URL&& url, String&& type, String&& path, String&& name)
Modified: trunk/Source/WebCore/fileapi/File.h (263829 => 263830)
--- trunk/Source/WebCore/fileapi/File.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/fileapi/File.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -42,7 +42,7 @@
};
// Create a file with an optional name exposed to the author (via File.name and associated DOM properties) that differs from the one provided in the path.
- WEBCORE_EXPORT static Ref<File> create(const String& path, const String& nameOverride = { });
+ WEBCORE_EXPORT static Ref<File> create(const String& path, const String& replacementPath = { }, const String& nameOverride = { });
// Create a File using the 'new File' constructor.
static Ref<File> create(Vector<BlobPartVariant>&& blobPartVariants, const String& filename, const PropertyBag& propertyBag)
Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (263829 => 263830)
--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -64,15 +64,17 @@
return *map;
}
-void ThreadableBlobRegistry::registerFileBlobURL(const URL& url, const String& path, const String& contentType)
+void ThreadableBlobRegistry::registerFileBlobURL(const URL& url, const String& path, const String& replacementPath, const String& contentType)
{
+ String effectivePath = !replacementPath.isNull() ? replacementPath : path;
+
if (isMainThread()) {
- blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(path), contentType);
+ blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(effectivePath), path, contentType);
return;
}
- callOnMainThread([url = "" path = path.isolatedCopy(), contentType = contentType.isolatedCopy()] {
- blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(path), contentType);
+ callOnMainThread([url = "" effectivePath = effectivePath.isolatedCopy(), path = path.isolatedCopy(), contentType = contentType.isolatedCopy()] {
+ blobRegistry().registerFileBlobURL(url, BlobDataFileReference::create(effectivePath), path, contentType);
});
}
Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h (263829 => 263830)
--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -40,7 +40,7 @@
class ThreadableBlobRegistry {
public:
- static void registerFileBlobURL(const URL&, const String& path, const String& contentType);
+ static void registerFileBlobURL(const URL&, const String& path, const String& replacementPath, const String& contentType);
static void registerBlobURL(const URL&, Vector<BlobPart>&& blobParts, const String& contentType);
static void registerBlobURL(SecurityOrigin*, const URL&, const URL& srcURL);
static void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, const String& fileBackedPath, const String& contentType);
Modified: trunk/Source/WebCore/html/DirectoryFileListCreator.cpp (263829 => 263830)
--- trunk/Source/WebCore/html/DirectoryFileListCreator.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/html/DirectoryFileListCreator.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -64,7 +64,7 @@
if (FileSystem::fileIsDirectory(info.path, FileSystem::ShouldFollowSymbolicLinks::No))
appendDirectoryFiles(info.path, FileSystem::pathGetFileName(info.path), fileObjects);
else
- fileObjects.append(File::create(info.path, info.displayName));
+ fileObjects.append(File::create(info.path, { }, info.displayName));
}
return FileList::create(WTFMove(fileObjects));
}
Modified: trunk/Source/WebCore/html/FileInputType.cpp (263829 => 263830)
--- trunk/Source/WebCore/html/FileInputType.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/html/FileInputType.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -115,12 +115,8 @@
Vector<FileChooserFileInfo> files;
size_t size = state.size();
files.reserveInitialCapacity(size / 2);
- for (size_t i = 0; i < size; i += 2) {
- if (!state[i + 1].isEmpty())
- files.uncheckedAppend({ state[i], state[i + 1] });
- else
- files.uncheckedAppend({ state[i] });
- }
+ for (size_t i = 0; i < size; i += 2)
+ files.uncheckedAppend({ state[i], { }, state[i + 1] });
return files;
}
@@ -414,7 +410,7 @@
if (!allowsDirectories()) {
auto files = paths.map([](auto& fileInfo) {
- return File::create(fileInfo.path, fileInfo.displayName);
+ return File::create(fileInfo.path, fileInfo.replacementPath, fileInfo.displayName);
});
didCreateFileList(FileList::create(WTFMove(files)), icon);
return;
@@ -469,11 +465,11 @@
Vector<FileChooserFileInfo> files;
files.reserveInitialCapacity(paths.size());
for (auto& path : paths)
- files.uncheckedAppend({ path });
+ files.uncheckedAppend({ path, { }, { } });
filesChosen(files);
} else
- filesChosen({ FileChooserFileInfo { paths[0] } });
+ filesChosen({ { paths[0], { }, { } } });
return true;
}
Modified: trunk/Source/WebCore/platform/FileChooser.cpp (263829 => 263830)
--- trunk/Source/WebCore/platform/FileChooser.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/platform/FileChooser.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -58,7 +58,7 @@
chooseFiles(filenames);
}
-void FileChooser::chooseFiles(const Vector<String>& filenames)
+void FileChooser::chooseFiles(const Vector<String>& filenames, const Vector<String>& replacementNames)
{
// FIXME: This is inelegant. We should not be looking at settings here.
if (m_settings.selectedFiles == filenames)
@@ -68,8 +68,8 @@
return;
Vector<FileChooserFileInfo> files;
- for (auto& filename : filenames)
- files.append(FileChooserFileInfo(filename));
+ for (size_t i = 0, size = filenames.size(); i < size; ++i)
+ files.append({ filenames[i], i < replacementNames.size() ? replacementNames[i] : nullString(), { } });
m_client->filesChosen(files);
}
@@ -88,7 +88,7 @@
Vector<FileChooserFileInfo> files;
for (auto& filename : filenames)
- files.append(FileChooserFileInfo(filename));
+ files.append({ filename, { }, { } });
m_client->filesChosen(files, displayString, icon);
}
Modified: trunk/Source/WebCore/platform/FileChooser.h (263829 => 263830)
--- trunk/Source/WebCore/platform/FileChooser.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/platform/FileChooser.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -46,18 +46,13 @@
class Icon;
struct FileChooserFileInfo {
- FileChooserFileInfo(const String& path, const String& displayName = String())
- : path(path)
- , displayName(displayName)
- {
- }
-
FileChooserFileInfo isolatedCopy() const
{
- return { path.isolatedCopy(), displayName.isolatedCopy() };
+ return { path.isolatedCopy(), replacementPath.isolatedCopy(), displayName.isolatedCopy() };
}
const String path;
+ const String replacementPath;
const String displayName;
};
@@ -87,7 +82,7 @@
void invalidate();
WEBCORE_EXPORT void chooseFile(const String& path);
- WEBCORE_EXPORT void chooseFiles(const Vector<String>& paths);
+ WEBCORE_EXPORT void chooseFiles(const Vector<String>& paths, const Vector<String>& replacementPaths = { });
#if PLATFORM(IOS_FAMILY)
// FIXME: This function is almost identical to FileChooser::chooseFiles(). We should merge this
// function with FileChooser::chooseFiles() and hence remove the PLATFORM(IOS_FAMILY)-guard.
Modified: trunk/Source/WebCore/platform/network/BlobDataFileReference.cpp (263829 => 263830)
--- trunk/Source/WebCore/platform/network/BlobDataFileReference.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/platform/network/BlobDataFileReference.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -32,17 +32,16 @@
namespace WebCore {
-BlobDataFileReference::BlobDataFileReference(const String& path)
+BlobDataFileReference::BlobDataFileReference(const String& path, const String& replacementPath)
: m_path(path)
+ , m_replacementPath(replacementPath)
{
}
BlobDataFileReference::~BlobDataFileReference()
{
-#if ENABLE(FILE_REPLACEMENT)
if (!m_replacementPath.isNull())
FileSystem::deleteFile(m_replacementPath);
-#endif
}
const String& BlobDataFileReference::path()
@@ -50,10 +49,9 @@
#if ENABLE(FILE_REPLACEMENT)
if (m_replacementShouldBeGenerated)
generateReplacementFile();
-
+#endif
if (!m_replacementPath.isNull())
return m_replacementPath;
-#endif
return m_path;
}
@@ -101,6 +99,13 @@
return;
#endif
+ // This is a registered blob with a replacement file. Get the Metadata of the replacement file.
+ if (!m_replacementPath.isNull()) {
+ metadata = FileSystem::fileMetadataFollowingSymlinks(m_replacementPath);
+ if (!metadata)
+ return;
+ }
+
m_size = metadata.value().length;
}
Modified: trunk/Source/WebCore/platform/network/BlobDataFileReference.h (263829 => 263830)
--- trunk/Source/WebCore/platform/network/BlobDataFileReference.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/platform/network/BlobDataFileReference.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -35,9 +35,9 @@
class WEBCORE_EXPORT BlobDataFileReference : public RefCounted<BlobDataFileReference> {
public:
- static Ref<BlobDataFileReference> create(const String& path)
+ static Ref<BlobDataFileReference> create(const String& path, const String& replacementPath = { })
{
- return adoptRef(*new BlobDataFileReference(path));
+ return adoptRef(*new BlobDataFileReference(path, replacementPath));
}
virtual ~BlobDataFileReference();
@@ -52,7 +52,7 @@
virtual void revokeFileAccess();
protected:
- BlobDataFileReference(const String& path);
+ BlobDataFileReference(const String& path, const String& replacementPath);
private:
#if ENABLE(FILE_REPLACEMENT)
@@ -60,8 +60,8 @@
#endif
String m_path;
+ String m_replacementPath;
#if ENABLE(FILE_REPLACEMENT)
- String m_replacementPath;
bool m_replacementShouldBeGenerated { false };
#endif
unsigned long long m_size { 0 };
Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (263829 => 263830)
--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -47,7 +47,7 @@
public:
// Registers a blob URL referring to the specified file.
- virtual void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& contentType) = 0;
+ virtual void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& path, const String& contentType) = 0;
// Registers a blob URL referring to the specified blob data.
virtual void registerBlobURL(const URL&, Vector<BlobPart>&&, const String& contentType) = 0;
Modified: trunk/Source/WebKit/ChangeLog (263829 => 263830)
--- trunk/Source/WebKit/ChangeLog 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/ChangeLog 2020-07-02 03:08:57 UTC (rev 263830)
@@ -1,3 +1,46 @@
+2020-07-01 Said Abou-Hallawa <[email protected]>
+
+ Allow the File object to be created with a replacement file
+ https://bugs.webkit.org/show_bug.cgi?id=213825
+
+ Reviewed by Darin Adler.
+
+ The UIProcess passes a list of strings which represents the replacement
+ paths along with a list to the original paths to the WebProcess. The
+ WebProcess passes these two list to FileChooser which creates the File
+ objects and register the Blobs.
+
+ The WebProcess registers the Blobs in the NetworkProcess which creates
+ BlobDataFileReference objects with both the original path and the
+ replacement path.
+
+ The WebProcess unregisters the Blobs from the NetworkProcess which deletes
+ the corresponding BlobDataFileReference from its registry. Upon destroying
+ the BlobDataFileReference, the replacement file should be deleted.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::registerFileBlobURL):
+ (WebKit::NetworkConnectionToWebProcess::registerBlobURLOptionallyFileBacked):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkProcessPlatformStrategies.cpp:
+ (WebKit::NetworkProcessPlatformStrategies::createBlobRegistry):
+ * Shared/BlobDataFileReferenceWithSandboxExtension.cpp:
+ (WebKit::BlobDataFileReferenceWithSandboxExtension::BlobDataFileReferenceWithSandboxExtension):
+ * Shared/BlobDataFileReferenceWithSandboxExtension.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChooseFilesForOpenPanel):
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::registerFileBlobURL):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+ * WebProcess/WebPage/WebOpenPanelResultListener.cpp:
+ (WebKit::WebOpenPanelResultListener::didChooseFiles):
+ * WebProcess/WebPage/WebOpenPanelResultListener.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didChooseFilesForOpenPanel):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2020-07-01 Tim Horton <[email protected]>
Swipe snapshot is removed too early when swiping away from a page that is still loading
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (263829 => 263830)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -732,7 +732,7 @@
#endif
-void NetworkConnectionToWebProcess::registerFileBlobURL(const URL& url, const String& path, SandboxExtension::Handle&& extensionHandle, const String& contentType)
+void NetworkConnectionToWebProcess::registerFileBlobURL(const URL& url, const String& path, const String& replacementPath, SandboxExtension::Handle&& extensionHandle, const String& contentType)
{
NETWORK_PROCESS_MESSAGE_CHECK(!url.isEmpty());
@@ -740,7 +740,7 @@
if (!session)
return;
- session->blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, SandboxExtension::create(WTFMove(extensionHandle))), contentType);
+ session->blobRegistry().registerFileBlobURL(url, BlobDataFileReferenceWithSandboxExtension::create(path, replacementPath, SandboxExtension::create(WTFMove(extensionHandle))), contentType);
}
void NetworkConnectionToWebProcess::registerBlobURL(const URL& url, Vector<BlobPart>&& blobParts, const String& contentType)
@@ -769,7 +769,7 @@
if (!session)
return;
- session->blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, BlobDataFileReferenceWithSandboxExtension::create(fileBackedPath, nullptr), contentType);
+ session->blobRegistry().registerBlobURLOptionallyFileBacked(url, srcURL, BlobDataFileReferenceWithSandboxExtension::create(fileBackedPath), contentType);
}
void NetworkConnectionToWebProcess::registerBlobURLForSlice(const URL& url, const URL& srcURL, int64_t start, int64_t end)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (263829 => 263830)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -215,7 +215,7 @@
void setRawCookie(const WebCore::Cookie&);
void deleteCookie(const URL&, const String& cookieName);
- void registerFileBlobURL(const URL&, const String& path, SandboxExtension::Handle&&, const String& contentType);
+ void registerFileBlobURL(const URL&, const String& path, const String& replacementPath, SandboxExtension::Handle&&, const String& contentType);
void registerBlobURL(const URL&, Vector<WebCore::BlobPart>&&, const String& contentType);
void registerBlobURLFromURL(const URL&, const URL& srcURL);
void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, const String& fileBackedPath, const String& contentType);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (263829 => 263830)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2020-07-02 03:08:57 UTC (rev 263830)
@@ -46,7 +46,7 @@
UnsubscribeFromCookieChangeNotifications(HashSet<String> hosts)
#endif
- RegisterFileBlobURL(URL url, String path, WebKit::SandboxExtension::Handle extensionHandle, String contentType)
+ RegisterFileBlobURL(URL url, String path, String replacementPath, WebKit::SandboxExtension::Handle extensionHandle, String contentType)
RegisterBlobURL(URL url, Vector<WebCore::BlobPart> blobParts, String contentType)
RegisterBlobURLFromURL(URL url, URL srcURL)
RegisterBlobURLOptionallyFileBacked(URL url, URL srcURL, String fileBackedPath, String contentType)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp (263829 => 263830)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessPlatformStrategies.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -57,7 +57,7 @@
{
using namespace WebCore;
class EmptyBlobRegistry : public WebCore::BlobRegistry {
- void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
+ void registerFileBlobURL(const URL&, Ref<BlobDataFileReference>&&, const String& path, const String& contentType) final { ASSERT_NOT_REACHED(); }
void registerBlobURL(const URL&, Vector<BlobPart>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
void registerBlobURL(const URL&, const URL& srcURL) final { ASSERT_NOT_REACHED(); }
void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, RefPtr<BlobDataFileReference>&&, const String& contentType) final { ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.cpp (263829 => 263830)
--- trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -30,8 +30,8 @@
namespace WebKit {
-BlobDataFileReferenceWithSandboxExtension::BlobDataFileReferenceWithSandboxExtension(const String& path, RefPtr<SandboxExtension>&& sandboxExtension)
- : BlobDataFileReference(path)
+BlobDataFileReferenceWithSandboxExtension::BlobDataFileReferenceWithSandboxExtension(const String& path, const String& replacementPath, RefPtr<SandboxExtension>&& sandboxExtension)
+ : BlobDataFileReference(path, replacementPath)
, m_sandboxExtension(WTFMove(sandboxExtension))
{
}
Modified: trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.h (263829 => 263830)
--- trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/Shared/BlobDataFileReferenceWithSandboxExtension.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -34,13 +34,13 @@
class BlobDataFileReferenceWithSandboxExtension final : public WebCore::BlobDataFileReference {
public:
- static Ref<BlobDataFileReference> create(const String& path, RefPtr<SandboxExtension>&& sandboxExtension)
+ static Ref<BlobDataFileReference> create(const String& path, const String& replacementPath = { }, RefPtr<SandboxExtension>&& sandboxExtension = nullptr)
{
- return adoptRef(*new BlobDataFileReferenceWithSandboxExtension(path, WTFMove(sandboxExtension)));
+ return adoptRef(*new BlobDataFileReferenceWithSandboxExtension(path, replacementPath, WTFMove(sandboxExtension)));
}
private:
- BlobDataFileReferenceWithSandboxExtension(const String& path, RefPtr<SandboxExtension>&&);
+ BlobDataFileReferenceWithSandboxExtension(const String& path, const String& replacementPath, RefPtr<SandboxExtension>&&);
virtual ~BlobDataFileReferenceWithSandboxExtension();
void prepareForFileAccess() override;
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (263829 => 263830)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -6700,7 +6700,7 @@
send(Messages::WebPage::ExtendSandboxForFilesFromOpenPanel(WTFMove(sandboxExtensionHandles)));
#endif
- send(Messages::WebPage::DidChooseFilesForOpenPanel(fileURLs));
+ send(Messages::WebPage::DidChooseFilesForOpenPanel(fileURLs, { }));
m_openPanelResultListener->invalidate();
m_openPanelResultListener = nullptr;
Modified: trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.cpp (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -36,7 +36,7 @@
namespace WebKit {
using namespace WebCore;
-void BlobRegistryProxy::registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& file, const String& contentType)
+void BlobRegistryProxy::registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& file, const String& path, const String& contentType)
{
SandboxExtension::Handle extensionHandle;
@@ -44,7 +44,8 @@
if (!file->path().isEmpty())
SandboxExtension::createHandle(file->path(), SandboxExtension::Type::ReadOnly, extensionHandle);
- WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, file->path(), extensionHandle, contentType), 0);
+ String replacementPath = path == file->path() ? nullString() : file->path();
+ WebProcess::singleton().ensureNetworkProcessConnection().connection().send(Messages::NetworkConnectionToWebProcess::RegisterFileBlobURL(url, path, replacementPath, extensionHandle, contentType), 0);
}
void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart>&& blobParts, const String& contentType)
Modified: trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/FileAPI/BlobRegistryProxy.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -31,7 +31,7 @@
class BlobRegistryProxy final : public WebCore::BlobRegistry {
public:
- void registerFileBlobURL(const URL&, Ref<WebCore::BlobDataFileReference>&&, const String& contentType) final;
+ void registerFileBlobURL(const URL&, Ref<WebCore::BlobDataFileReference>&&, const String& path, const String& contentType) final;
void registerBlobURL(const URL&, Vector<WebCore::BlobPart>&&, const String& contentType) final;
void registerBlobURL(const URL&, const URL& srcURL) final;
void registerBlobURLOptionallyFileBacked(const URL&, const URL& srcURL, RefPtr<WebCore::BlobDataFileReference>&&, const String& contentType) final;
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.cpp (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -46,9 +46,9 @@
{
}
-void WebOpenPanelResultListener::didChooseFiles(const Vector<String>& files)
+void WebOpenPanelResultListener::didChooseFiles(const Vector<String>& files, const Vector<String>& replacementFiles)
{
- m_fileChooser->chooseFiles(files);
+ m_fileChooser->chooseFiles(files, replacementFiles);
}
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.h (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebOpenPanelResultListener.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -44,7 +44,7 @@
~WebOpenPanelResultListener();
void disconnectFromPage() { m_page = 0; }
- void didChooseFiles(const Vector<String>&);
+ void didChooseFiles(const Vector<String>& files, const Vector<String>& replacementFiles);
#if PLATFORM(IOS_FAMILY)
void didChooseFilesWithDisplayStringAndIcon(const Vector<String>&, const String& displayString, WebCore::Icon*);
#endif
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -4301,12 +4301,12 @@
}
#endif
-void WebPage::didChooseFilesForOpenPanel(const Vector<String>& files)
+void WebPage::didChooseFilesForOpenPanel(const Vector<String>& files, const Vector<String>& replacementFiles)
{
if (!m_activeOpenPanelResultListener)
return;
- m_activeOpenPanelResultListener->didChooseFiles(files);
+ m_activeOpenPanelResultListener->didChooseFiles(files, replacementFiles);
m_activeOpenPanelResultListener = nullptr;
}
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-07-02 03:08:57 UTC (rev 263830)
@@ -1602,7 +1602,7 @@
void failedToShowPopupMenu();
#endif
- void didChooseFilesForOpenPanel(const Vector<String>&);
+ void didChooseFilesForOpenPanel(const Vector<String>& files, const Vector<String>& replacementFiles);
void didCancelForOpenPanel();
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in (263829 => 263830)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.messages.in 2020-07-02 03:08:57 UTC (rev 263830)
@@ -343,7 +343,7 @@
#if PLATFORM(IOS_FAMILY)
DidChooseFilesForOpenPanelWithDisplayStringAndIcon(Vector<String> fileURLs, String displayString, IPC::DataReference iconData, WebKit::SandboxExtension::Handle frontboardServicesSandboxExtension, WebKit::SandboxExtension::Handle iconServicesSandboxExtension)
#endif
- DidChooseFilesForOpenPanel(Vector<String> fileURLs)
+ DidChooseFilesForOpenPanel(Vector<String> fileURLs, Vector<String> replacementURLs)
DidCancelForOpenPanel()
#if ENABLE(SANDBOX_EXTENSIONS)
ExtendSandboxForFilesFromOpenPanel(WebKit::SandboxExtension::HandleArray sandboxExtensions)
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (263829 => 263830)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-07-02 03:08:57 UTC (rev 263830)
@@ -1,3 +1,12 @@
+2020-07-01 Said Abou-Hallawa <[email protected]>
+
+ Allow the File object to be created with a replacement file
+ https://bugs.webkit.org/show_bug.cgi?id=213825
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebPlatformStrategies.mm:
+
2020-06-30 Sam Weinig <[email protected]>
Split Color serialization out of Color classes
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm (263829 => 263830)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPlatformStrategies.mm 2020-07-02 03:08:57 UTC (rev 263830)
@@ -93,7 +93,7 @@
class WebBlobRegistry final : public BlobRegistry {
private:
- void registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& reference, const String& contentType) final { m_blobRegistry.registerFileBlobURL(url, WTFMove(reference), contentType); }
+ void registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& reference, const String&, const String& contentType) final { m_blobRegistry.registerFileBlobURL(url, WTFMove(reference), contentType); }
void registerBlobURL(const URL& url, Vector<BlobPart>&& parts, const String& contentType) final { m_blobRegistry.registerBlobURL(url, WTFMove(parts), contentType); }
void registerBlobURL(const URL& url, const URL& srcURL) final { m_blobRegistry.registerBlobURL(url, srcURL); }
void registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, RefPtr<BlobDataFileReference>&& reference, const String& contentType) final { m_blobRegistry.registerBlobURLOptionallyFileBacked(url, srcURL, WTFMove(reference), contentType); }
Modified: trunk/Source/WebKitLegacy/win/ChangeLog (263829 => 263830)
--- trunk/Source/WebKitLegacy/win/ChangeLog 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKitLegacy/win/ChangeLog 2020-07-02 03:08:57 UTC (rev 263830)
@@ -1,3 +1,12 @@
+2020-07-01 Said Abou-Hallawa <[email protected]>
+
+ Allow the File object to be created with a replacement file
+ https://bugs.webkit.org/show_bug.cgi?id=213825
+
+ Reviewed by Darin Adler.
+
+ * WebCoreSupport/WebPlatformStrategies.cpp:
+
2020-06-28 Geoffrey Garen <[email protected]>
Rename initializeThreading to initialize
Modified: trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp (263829 => 263830)
--- trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2020-07-02 02:58:07 UTC (rev 263829)
+++ trunk/Source/WebKitLegacy/win/WebCoreSupport/WebPlatformStrategies.cpp 2020-07-02 03:08:57 UTC (rev 263830)
@@ -80,7 +80,7 @@
class WebBlobRegistry final : public BlobRegistry {
private:
- void registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& reference, const String& contentType) final { m_blobRegistry.registerFileBlobURL(url, WTFMove(reference), contentType); }
+ void registerFileBlobURL(const URL& url, Ref<BlobDataFileReference>&& reference, const String&, const String& contentType) final { m_blobRegistry.registerFileBlobURL(url, WTFMove(reference), contentType); }
void registerBlobURL(const URL& url, Vector<BlobPart>&& parts, const String& contentType) final { m_blobRegistry.registerBlobURL(url, WTFMove(parts), contentType); }
void registerBlobURL(const URL& url, const URL& srcURL) final { m_blobRegistry.registerBlobURL(url, srcURL); }
void registerBlobURLOptionallyFileBacked(const URL& url, const URL& srcURL, RefPtr<BlobDataFileReference>&& reference, const String& contentType) final { m_blobRegistry.registerBlobURLOptionallyFileBacked(url, srcURL, WTFMove(reference), contentType); }
