summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2020-09-02 09:15:16 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-10-04 10:19:37 +0200
commita6e2b32e9c788bd151fef3367cbffa05b0763ff5 (patch)
tree9f544a8c984107e501f72b865ccc0b3b0451dfe8
parent386dc17e35b1614237e090ca3f9265d0f6e6319d (diff)
downloadqtwebengine-chromium-a6e2b32e9c788bd151fef3367cbffa05b0763ff5.tar.gz
Do not request BadgeService interface
QtWebEngine does not bind BadgeService. Without this, a navigator.setAppBadge() call would cause render process crash because of bad Mojo message. Based on: https://chromium-review.googlesource.com/c/chromium/src/+/2106921 Change-Id: Id588c81404fbec910be6a66f167316c2ed74eefd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/third_party/blink/renderer/modules/badging/navigator_badge.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/modules/badging/navigator_badge.cc b/chromium/third_party/blink/renderer/modules/badging/navigator_badge.cc
index 3c2031f5d7d..288f6e006f5 100644
--- a/chromium/third_party/blink/renderer/modules/badging/navigator_badge.cc
+++ b/chromium/third_party/blink/renderer/modules/badging/navigator_badge.cc
@@ -82,7 +82,7 @@ ScriptPromise NavigatorBadge::SetAppBadgeHelper(
if (badge_value->is_number() && badge_value->get_number() == 0)
return ClearAppBadgeHelper(script_state);
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
From(script_state).badge_service()->SetBadge(std::move(badge_value));
#endif
return ScriptPromise::CastUndefined(script_state);
@@ -90,7 +90,7 @@ ScriptPromise NavigatorBadge::SetAppBadgeHelper(
// static
ScriptPromise NavigatorBadge::ClearAppBadgeHelper(ScriptState* script_state) {
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(TOOLKIT_QT)
From(script_state).badge_service()->ClearBadge();
#endif
return ScriptPromise::CastUndefined(script_state);