From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 widget/uikit/TextInputHandler.mm | 18 ++----------------
 widget/uikit/nsLookAndFeel.mm    |  3 ---
 2 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'widget/uikit')

diff --git a/widget/uikit/TextInputHandler.mm b/widget/uikit/TextInputHandler.mm
index 9a4a6ae226..3ee3573b83 100644
--- a/widget/uikit/TextInputHandler.mm
+++ b/widget/uikit/TextInputHandler.mm
@@ -10,6 +10,7 @@
 
 #include "mozilla/EventForwards.h"
 #include "mozilla/Logging.h"
+#include "mozilla/MacStringHelpers.h"
 #include "mozilla/MiscEvents.h"
 #include "mozilla/TextEventDispatcher.h"
 #include "mozilla/TextEvents.h"
@@ -23,21 +24,6 @@ mozilla::LazyLogModule gIMELog("TextInputHandler");
 
 namespace mozilla::widget {
 
-static void GetStringForNSString(const NSString* aSrc, nsAString& aDist) {
-  NS_OBJC_BEGIN_TRY_IGNORE_BLOCK;
-
-  if (!aSrc) {
-    aDist.Truncate();
-    return;
-  }
-
-  aDist.SetLength([aSrc length]);
-  [aSrc getCharacters:reinterpret_cast<unichar*>(aDist.BeginWriting())
-                range:NSMakeRange(0, [aSrc length])];
-
-  NS_OBJC_END_TRY_IGNORE_BLOCK;
-}
-
 NS_IMPL_ISUPPORTS(TextInputHandler, TextEventDispatcherListener,
                   nsISupportsWeakReference)
 
@@ -63,7 +49,7 @@ void TextInputHandler::WillDispatchKeyboardEvent(
 
 bool TextInputHandler::InsertText(NSString* aText) {
   nsString str;
-  GetStringForNSString(aText, str);
+  CopyNSStringToXPCOMString(aText, str);
 
   MOZ_LOG(gIMELog, LogLevel::Info,
           ("%p TextInputHandler::InsertText(aText=%s)", this,
diff --git a/widget/uikit/nsLookAndFeel.mm b/widget/uikit/nsLookAndFeel.mm
index b420cc9a1d..51a9a95b52 100644
--- a/widget/uikit/nsLookAndFeel.mm
+++ b/widget/uikit/nsLookAndFeel.mm
@@ -232,9 +232,6 @@ nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
     case IntID::CaretWidth:
       aResult = 1;
       break;
-    case IntID::ShowCaretDuringSelection:
-      aResult = 0;
-      break;
     case IntID::SelectTextfieldsOnKeyFocus:
       // Select textfield content when focused by kbd
       // used by nsEventStateManager::sTextfieldSelectModel
-- 
cgit v1.2.3