Revert "Bug 1966443: Skip NUL characters in text that is copied to clipboard or dragged r=gstoll,dom-core,edgar" for causing mochitest failures in test_dnd_ignoreNuls.html

This reverts commit 1affb70.

Revert "Bug 1966443: Clean up after tests that open context menus r=masayuki"

This reverts commit a2ba53f.

Revert "Bug 1966443: Ignore NULs in clipboard paste and DND drop operations r=stransky,geckoview-reviewers,mac-reviewers,bradwerth,tcampbell"

This reverts commit 220cc23.

Revert "Bug 1966443: Make synthesizeMockDragAndDrop usable in plain mochitests r=edgar"

This reverts commit 9e6fb6b.

Author: Cristian Tuns

dom/base/nsContentAreaDragDrop.cpp

@@ -640,8 +640,6 @@ nsresult DragDataProducer::Produce(DataTransfer* aDataTransfer, bool* aCanDrag,
     data = do_QueryInterface(supports);
     if (NS_SUCCEEDED(rv)) {
       data->GetData(mHtmlString);
-      // Do not add NULs to DND text.
-      mHtmlString.StripChar(L'\0');
     }
     rv = transferable->GetTransferData(kHTMLContext, getter_AddRefs(supports));
     data = do_QueryInterface(supports);
@@ -657,8 +655,6 @@ nsresult DragDataProducer::Produce(DataTransfer* aDataTransfer, bool* aCanDrag,
     data = do_QueryInterface(supports);
     NS_ENSURE_SUCCESS(rv, rv);  // require plain text at a minimum
     data->GetData(mTitleString);
-    // Do not add NULs to DND text.
-    mTitleString.StripChar(L'\0');
   }
 
   // default text value is the URL

dom/ipc/BrowserChild.cpp

@@ -80,7 +80,6 @@
 #include "mozilla/layers/ImageBridgeChild.h"
 #include "mozilla/layers/InputAPZContext.h"
 #include "mozilla/layers/WebRenderLayerManager.h"
-#include "mozilla/widget/WidgetLogging.h"
 #include "nsCommandParams.h"
 #include "nsContentPermissionHelper.h"
 #include "nsContentUtils.h"
@@ -144,6 +143,16 @@ using namespace mozilla::layout;
 using namespace mozilla::widget;
 using mozilla::layers::GeckoContentController;
 
+extern mozilla::LazyLogModule sWidgetDragServiceLog;
+#define __DRAGSERVICE_LOG__(logLevel, ...) \
+  MOZ_LOG(sWidgetDragServiceLog, logLevel, __VA_ARGS__)
+#define DRAGSERVICE_LOGD(...) \
+  __DRAGSERVICE_LOG__(mozilla::LogLevel::Debug, (__VA_ARGS__))
+#define DRAGSERVICE_LOGI(...) \
+  __DRAGSERVICE_LOG__(mozilla::LogLevel::Info, (__VA_ARGS__))
+#define DRAGSERVICE_LOGE(...) \
+  __DRAGSERVICE_LOG__(mozilla::LogLevel::Error, (__VA_ARGS__))
+
 static const char BEFORE_FIRST_PAINT[] = "before-first-paint";
 
 static uint32_t sConsecutiveTouchMoveCount = 0;
@@ -2126,11 +2135,10 @@ mozilla::ipc::IPCResult BrowserChild::RecvRealDragEvent(
   nsCOMPtr<nsIDragSession> dragSession = GetDragSession();
   DRAGSERVICE_LOGD(
       "[%p] %s | aEvent.mMessage: %s | aDragAction: %u | aDropEffect: %u | "
-      "widgetRelativePt: (%d,%d) | dragSession: %p",
+      "dragSession: %p",
       this, __FUNCTION__,
       NS_ConvertUTF16toUTF8(dom::Event::GetEventName(aEvent.mMessage)).get(),
-      aDragAction, aDropEffect, static_cast<int>(localEvent.mRefPoint.x),
-      static_cast<int>(localEvent.mRefPoint.y), dragSession.get());
+      aDragAction, aDropEffect, dragSession.get());
   if (dragSession) {
     dragSession->SetDragAction(aDragAction);
     dragSession->SetTriggeringPrincipal(aPrincipal);

testing/mochitest/tests/SimpleTest/DragParentContextBase.sys.mjs

@@ -13,12 +13,23 @@ export class DragParentContextBase {
   // Browsing context that the related element is in
   browsingContext = null;
 
-  constructor(aSubtypeName, aBrowsingContext, aParams, aSpecialPowers) {
+  constructor(
+    aSubtypeName,
+    aBrowsingContext,
+    aParams,
+    aSpecialPowers,
+    aOk,
+    aIs,
+    aInfo
+  ) {
     Object.assign(this, aParams);
     this.params = aParams;
     this.subtypeName = aSubtypeName;
     this.browsingContext = aBrowsingContext;
     this.specialPowers = aSpecialPowers;
+    this.ok = aOk;
+    this.is = aIs;
+    this.info = aInfo;
   }
 
   getElementPositions() {

testing/mochitest/tests/SimpleTest/DragSourceParentContext.sys.mjs

@@ -7,8 +7,16 @@ import { DragParentContextBase } from "./DragParentContextBase.sys.mjs";
 
 /* global content */
 export class DragSourceParentContext extends DragParentContextBase {
-  constructor(aBrowsingContext, aParams, aSpecialPowers) {
-    super("dragSource", aBrowsingContext, aParams, aSpecialPowers);
+  constructor(aBrowsingContext, aParams, aSpecialPowers, aOk, aIs, aInfo) {
+    super(
+      "dragSource",
+      aBrowsingContext,
+      aParams,
+      aSpecialPowers,
+      aOk,
+      aIs,
+      aInfo
+    );
   }
 
   initialize() {

testing/mochitest/tests/SimpleTest/DragTargetParentContext.sys.mjs

@@ -7,8 +7,16 @@ import { DragParentContextBase } from "./DragParentContextBase.sys.mjs";
 
 /* global content */
 export class DragTargetParentContext extends DragParentContextBase {
-  constructor(aBrowsingContext, aParams, aSpecialPowers) {
-    super("dragTarget", aBrowsingContext, aParams, aSpecialPowers);
+  constructor(aBrowsingContext, aParams, aSpecialPowers, aOk, aIs, aInfo) {
+    super(
+      "dragTarget",
+      aBrowsingContext,
+      aParams,
+      aSpecialPowers,
+      aOk,
+      aIs,
+      aInfo
+    );
   }
 
   initialize() {