mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-01 21:59:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Make the drag data store reference counted

Browse source 
Ownership of the drag data store is a bit weird. In a normal drag-and-
drop operation, the DragAndDropEventHandler owns the store. When events
are fired for the operation, the DataTransfer object assigned to those
events are "associated" with the store. We currently represent that with
an Optional<DragDataStore&>.

However, it's also possible to create DataTransfer objects from scripts.
Those objects create their own drag data store. This puts DataTransfer
in a weird situation where it may own a store or just reference one.

Rather than coming up with something like Variant<DDS, DDS&> or using
MaybeOwned<DDS> here, we can get by with just making the store reference
counted.
This commit is contained in:
Timothy Flynn 2024-08-21 06:39:02 -04:00 • committed by Andreas Kling
commit f7c4165dde
Notes: github-actions[bot] 2024-08-22 12:23:00 +00:00
6 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibWeb/HTML/DataTransfer.cpp
View file

@ -76,7 +76,7 @@ void DataTransfer::set_effect_allowed(FlyString effect_allowed)
// On setting, if drag data store's mode is the read/write mode and the new value is one of "none", "copy", "copyLink",
// "copyMove", "link", "linkMove", "move", "all", or "uninitialized", then the attribute's current value must be set
// to the new value. Otherwise, it must be left unchanged.
if (m_associated_drag_data_store.has_value() && m_associated_drag_data_store->mode() == DragDataStore::Mode::ReadWrite)
if (m_associated_drag_data_store && m_associated_drag_data_store->mode() == DragDataStore::Mode::ReadWrite)
set_effect_allowed_internal(move(effect_allowed));
}
@ -109,7 +109,7 @@ ReadonlySpan<String> DataTransfer::types() const
String DataTransfer::get_data(String const& format_argument) const
{
// 1. If the DataTransfer object is no longer associated with a drag data store, then return the empty string.
if (!m_associated_drag_data_store.has_value())
if (!m_associated_drag_data_store)
return {};
// 2. If the drag data store's mode is the protected mode, then return the empty string.
@ -165,7 +165,7 @@ JS::NonnullGCPtr<FileAPI::FileList> DataTransfer::files() const
// 2. If the DataTransfer object is no longer associated with a drag data store, the FileList is empty. Return
// the empty list L.
if (!m_associated_drag_data_store.has_value())
if (!m_associated_drag_data_store)
return files;
// 3. If the drag data store's mode is the protected mode, return the empty list L.
@ -195,9 +195,9 @@ JS::NonnullGCPtr<FileAPI::FileList> DataTransfer::files() const
return files;
}
void DataTransfer::associate_with_drag_data_store(DragDataStore& drag_data_store)
void DataTransfer::associate_with_drag_data_store(NonnullRefPtr<DragDataStore> drag_data_store)
{
m_associated_drag_data_store = drag_data_store;
m_associated_drag_data_store = move(drag_data_store);
update_data_transfer_types_list();
}
@ -214,7 +214,7 @@ void DataTransfer::update_data_transfer_types_list()
Vector<String> types;
// 2. If the DataTransfer object is still associated with a drag data store, then:
if (m_associated_drag_data_store.has_value()) {
if (m_associated_drag_data_store) {
bool contains_file = false;
// 1. For each item in the DataTransfer object's drag data store item list whose kind is text, add an entry to L