diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
| commit | def92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch) | |
| tree | 2ef34b9ad8bb9a9220e05d60352558b15f513894 /widget/uikit | |
| parent | Adding debian version 125.0.3-1. (diff) | |
| download | firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/uikit')
| -rw-r--r-- | widget/uikit/TextInputHandler.mm | 18 | ||||
| -rw-r--r-- | widget/uikit/nsLookAndFeel.mm | 3 |
2 files changed, 2 insertions, 19 deletions
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 |