mirror of https://github.com/electron/electron
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <marshallofsound@electronjs.org>
|
|
Date: Tue, 13 Jun 2023 15:36:04 -0700
|
|
Subject: expose WebBlob::Path to allow embedders to get file paths
|
|
|
|
Used to replace the File.path augmentation Electron currently implements. This is safer / more web-standard technique.
|
|
|
|
diff --git a/third_party/blink/public/web/web_blob.h b/third_party/blink/public/web/web_blob.h
|
|
index 384a59138db11ea38028f844dd67e328ebffbe7b..f153997c2afccef1fa1b64ee5f162c28a2d07e5d 100644
|
|
--- a/third_party/blink/public/web/web_blob.h
|
|
+++ b/third_party/blink/public/web/web_blob.h
|
|
@@ -67,6 +67,7 @@ class BLINK_EXPORT WebBlob {
|
|
void Reset();
|
|
void Assign(const WebBlob&);
|
|
WebString Uuid();
|
|
+ std::string Path();
|
|
|
|
bool IsNull() const { return private_.IsNull(); }
|
|
|
|
diff --git a/third_party/blink/renderer/core/exported/web_blob.cc b/third_party/blink/renderer/core/exported/web_blob.cc
|
|
index f10a9bf39de576dfdf97d9c14447cd0de2026b89..3decbdfad72f4a08d6039555f269bcd94a47c053 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_blob.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_blob.cc
|
|
@@ -41,6 +41,7 @@
|
|
#include "third_party/blink/renderer/core/execution_context/execution_context.h"
|
|
#include "third_party/blink/renderer/core/fileapi/blob.h"
|
|
#include "third_party/blink/renderer/core/fileapi/file_backed_blob_factory_dispatcher.h"
|
|
+#include "third_party/blink/renderer/core/fileapi/file.h"
|
|
#include "third_party/blink/renderer/platform/blob/blob_data.h"
|
|
#include "third_party/blink/renderer/platform/file_metadata.h"
|
|
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
|
|
@@ -84,6 +85,14 @@ WebString WebBlob::Uuid() {
|
|
return private_->Uuid();
|
|
}
|
|
|
|
+std::string WebBlob::Path() {
|
|
+ if (!private_.Get())
|
|
+ return "";
|
|
+ if (private_->IsFile() && private_->HasBackingFile())
|
|
+ return To<File>(private_.Get())->GetPath().Utf8();
|
|
+ return "";
|
|
+}
|
|
+
|
|
v8::Local<v8::Value> WebBlob::ToV8Value(v8::Isolate* isolate) {
|
|
if (!private_.Get())
|
|
return v8::Local<v8::Value>();
|