summaryrefslogtreecommitdiffstats
path: root/widget/android
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:13:27 +0000
commit40a355a42d4a9444dc753c04c6608dade2f06a23 (patch)
tree871fc667d2de662f171103ce5ec067014ef85e61 /widget/android
parentAdding upstream version 124.0.1. (diff)
downloadfirefox-adbda400be353e676059e335c3c0aaf99e719475.tar.xz
firefox-adbda400be353e676059e335c3c0aaf99e719475.zip
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'widget/android')
-rw-r--r--widget/android/EventDispatcher.cpp6
-rw-r--r--widget/android/GfxInfo.cpp10
-rw-r--r--widget/android/jni/Utils.cpp2
-rw-r--r--widget/android/nsLookAndFeel.cpp4
4 files changed, 9 insertions, 13 deletions
diff --git a/widget/android/EventDispatcher.cpp b/widget/android/EventDispatcher.cpp
index ab876de136..6e414c11ce 100644
--- a/widget/android/EventDispatcher.cpp
+++ b/widget/android/EventDispatcher.cpp
@@ -129,9 +129,9 @@ nsresult UnboxBundle(JSContext* aCx, const jni::Object::LocalRef& aData,
nsresult rv = UnboxValue(aCx, values->GetElement(i), &value);
if (rv == NS_ERROR_INVALID_ARG && !JS_IsExceptionPending(aCx)) {
JS_ReportErrorUTF8(
- aCx, u8"Invalid event data property %s",
- NS_ConvertUTF16toUTF8(
- nsString(reinterpret_cast<const char16_t*>(keyChars), keyLen))
+ aCx, "Invalid event data property %s",
+ NS_ConvertUTF16toUTF8(reinterpret_cast<const char16_t*>(keyChars),
+ keyLen)
.get());
}
NS_ENSURE_SUCCESS(rv, rv);
diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp
index 0e78b187bf..6e6d3bf47b 100644
--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -350,11 +350,11 @@ GfxInfo::GetDrmRenderDevice(nsACString& aDrmRenderDevice) {
}
void GfxInfo::AddCrashReportAnnotations() {
- CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::AdapterVendorID,
- mGLStrings->Vendor());
- CrashReporter::AnnotateCrashReport(CrashReporter::Annotation::AdapterDeviceID,
- mGLStrings->Renderer());
- CrashReporter::AnnotateCrashReport(
+ CrashReporter::RecordAnnotationNSCString(
+ CrashReporter::Annotation::AdapterVendorID, mGLStrings->Vendor());
+ CrashReporter::RecordAnnotationNSCString(
+ CrashReporter::Annotation::AdapterDeviceID, mGLStrings->Renderer());
+ CrashReporter::RecordAnnotationNSCString(
CrashReporter::Annotation::AdapterDriverVersion, mGLStrings->Version());
}
diff --git a/widget/android/jni/Utils.cpp b/widget/android/jni/Utils.cpp
index 08164e4950..8d3800fd03 100644
--- a/widget/android/jni/Utils.cpp
+++ b/widget/android/jni/Utils.cpp
@@ -221,7 +221,7 @@ bool HandleUncaughtException(JNIEnv* aEnv) {
bool ReportException(JNIEnv* aEnv, jthrowable aExc, jstring aStack) {
bool result = true;
- result &= NS_SUCCEEDED(CrashReporter::AnnotateCrashReport(
+ result &= NS_SUCCEEDED(CrashReporter::RecordAnnotationNSCString(
CrashReporter::Annotation::JavaStackTrace,
String::Ref::From(aStack)->ToCString()));
diff --git a/widget/android/nsLookAndFeel.cpp b/widget/android/nsLookAndFeel.cpp
index 02919e0dbf..6d9f8c634f 100644
--- a/widget/android/nsLookAndFeel.cpp
+++ b/widget/android/nsLookAndFeel.cpp
@@ -312,10 +312,6 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
aResult = 200;
break;
- case IntID::TooltipDelay:
- aResult = 500;
- break;
-
case IntID::MenusCanOverlapOSBar:
// we want XUL popups to be able to overlap the task bar.
aResult = 1;