1 files changed, 15 insertions, 21 deletions

diff --git a/chromium/third_party/blink/renderer/core/clipboard/data_transfer.h b/chromium/third_party/blink/renderer/core/clipboard/data_transfer.h
index 5887f8abead..8884592ff33 100644
--- a/chromium/third_party/blink/renderer/core/clipboard/data_transfer.h
+++ b/chromium/third_party/blink/renderer/core/clipboard/data_transfer.h
@@ -25,6 +25,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_CORE_CLIPBOARD_DATA_TRANSFER_H_
 
 #include <memory>
+
 #include "third_party/blink/public/common/page/drag_operation.h"
 #include "third_party/blink/renderer/core/clipboard/data_object.h"
 #include "third_party/blink/renderer/core/core_export.h"
@@ -33,6 +34,8 @@
 #include "third_party/blink/renderer/platform/geometry/int_point.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
 #include "third_party/blink/renderer/platform/wtf/forward.h"
+#include "third_party/blink/renderer/platform/wtf/text/atomic_string.h"
+#include "ui/base/dragdrop/mojom/drag_drop_types.mojom-blink-forward.h"
 
 namespace blink {
 
@@ -77,15 +80,13 @@ class CORE_EXPORT DataTransfer final : public ScriptWrappable,
   bool IsForCopyAndPaste() const { return transfer_type_ == kCopyAndPaste; }
   bool IsForDragAndDrop() const { return transfer_type_ == kDragAndDrop; }
 
-  String dropEffect() const {
-    return DropEffectIsUninitialized() ? "none" : drop_effect_;
-  }
-  void setDropEffect(const String&);
-  bool DropEffectIsUninitialized() const {
-    return drop_effect_ == "uninitialized";
+  AtomicString dropEffect() const {
+    return DropEffectIsInitialized() ? drop_effect_ : "none";
   }
-  String effectAllowed() const { return effect_allowed_; }
-  void setEffectAllowed(const String&);
+  void setDropEffect(const AtomicString&);
+  bool DropEffectIsInitialized() const { return !drop_effect_.IsNull(); }
+  AtomicString effectAllowed() const { return effect_allowed_; }
+  void setEffectAllowed(const AtomicString&);
 
   void clearData(const String& type = String());
   String getData(const String& type) const;
@@ -123,12 +124,10 @@ class CORE_EXPORT DataTransfer final : public ScriptWrappable,
   // anyway.
   bool CanSetDragImage() const;
 
-  DragOperation SourceOperation() const;
-  DragOperation DestinationOperation() const;
-  void SetSourceOperation(DragOperation);
-  void SetDestinationOperation(DragOperation);
-
-  bool HasDropZoneType(const String&);
+  DragOperationsMask SourceOperation() const;
+  ui::mojom::blink::DragOperation DestinationOperation() const;
+  void SetSourceOperation(DragOperationsMask);
+  void SetDestinationOperation(ui::mojom::blink::DragOperation);
 
   DataTransferItemList* items();
 
@@ -148,7 +147,6 @@ class CORE_EXPORT DataTransfer final : public ScriptWrappable,
   static std::unique_ptr<DragImage> CreateDragImageForFrame(
       LocalFrame&,
       float,
-      RespectImageOrientationEnum,
       const FloatSize& css_size,
       const FloatPoint& paint_offset,
       PaintRecordBuilder&,
@@ -169,8 +167,8 @@ class CORE_EXPORT DataTransfer final : public ScriptWrappable,
   // Instead of using this member directly, prefer to use the can*() methods
   // above.
   DataTransferAccessPolicy policy_;
-  String drop_effect_;
-  String effect_allowed_;
+  AtomicString drop_effect_;
+  AtomicString effect_allowed_;
   DataTransferType transfer_type_;
   Member<DataObject> data_object_;
 
@@ -181,10 +179,6 @@ class CORE_EXPORT DataTransfer final : public ScriptWrappable,
   Member<Node> drag_image_element_;
 };
 
-DragOperation ConvertDropZoneOperationToDragOperation(
-    const String& drag_operation);
-String ConvertDragOperationToDropZoneOperation(DragOperation);
-
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_CORE_CLIPBOARD_DATA_TRANSFER_H_