diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-30 11:41:51 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-01-06 00:00:55 +0100 |
| commit | 5121effa745cf88b6d50630249570113941c2ca2 (patch) | |
| tree | 632ed3f3324667366ced2329459f9ca6205941af /src/core/web_contents_adapter.cpp | |
| parent | 5836832dfde5687dae5762509e560e1c7f2258ce (diff) | |
Adaptations for 108-based
Pick-to: 6.5
Fixes: QTBUG-105147
Change-Id: I0022964903f3443cc97843c62468ab9be8ae2ed8
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 1458c25ff..467266ee6 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -153,14 +153,10 @@ static QVariant fromJSValue(const base::Value *result) } case base::Value::Type::DICTIONARY: { - const base::DictionaryValue *out; - if (result->GetAsDictionary(&out)) { + if (const auto dict = result->GetIfDict()) { QVariantMap map; - base::DictionaryValue::Iterator it(*out); - while (!it.IsAtEnd()) { - map.insert(toQt(it.key()), fromJSValue(&it.value())); - it.Advance(); - } + for (const auto pair : *dict) + map.insert(toQt(pair.first), fromJSValue(&pair.second)); ret.setValue(map); } break; @@ -1026,7 +1022,7 @@ QAccessibleInterface *WebContentsAdapter::browserAccessible() content::BrowserAccessibilityManager *manager = rfh->GetOrCreateBrowserAccessibilityManager(); if (!manager) // FIXME! return nullptr; - content::BrowserAccessibility *acc = manager->GetRoot(); + content::BrowserAccessibility *acc = manager->GetFromAXNode(manager->GetRoot()); return content::toQAccessibleInterface(acc); } |