From 61de0e721f672e854551a8938d2d42ba946398cf Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 6 Oct 2021 17:06:14 +0200 Subject: Adaptations for Chromium 94 Change-Id: I9fb8998a3a7762b0aea70993ca231f0bbf4f7761 Reviewed-by: Michal Klocek --- src/core/web_contents_adapter.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/core/web_contents_adapter.cpp') diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 7843c7708..9472e7748 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -76,6 +76,7 @@ #include "content/public/browser/download_request_utils.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/navigation_entry.h" +#include "content/public/browser/navigation_entry_restore_context.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/favicon_status.h" #include "content/public/common/content_switches.h" @@ -151,16 +152,14 @@ static QVariant fromJSValue(const base::Value *result) } case base::Value::Type::INTEGER: { - int out; - if (result->GetAsInteger(&out)) - ret.setValue(out); + if (auto out = result->GetIfInt()) + ret.setValue(*out); break; } case base::Value::Type::DOUBLE: { - double out; - if (result->GetAsDouble(&out)) - ret.setValue(out); + if (auto out = result->GetIfDouble()) + ret.setValue(*out); break; } case base::Value::Type::STRING: @@ -299,6 +298,8 @@ static void deserializeNavigationHistory(QDataStream &input, int *currentIndex, int count; input >> count >> *currentIndex; + std::unique_ptr context = content::NavigationEntryRestoreContext::Create(); // FIXME? + entries->reserve(count); // Logic taken from SerializedNavigationEntry::ReadFromPickle and ToNavigationEntries. for (int i = 0; i < count; ++i) { @@ -349,7 +350,7 @@ static void deserializeNavigationHistory(QDataStream &input, int *currentIndex, nullptr); entry->SetTitle(toString16(title)); - entry->SetPageState(blink::PageState::CreateFromEncodedData(std::string(pageState.data(), pageState.size()))); + entry->SetPageState(blink::PageState::CreateFromEncodedData(std::string(pageState.data(), pageState.size())), context.get()); entry->SetHasPostData(hasPostData); entry->SetOriginalRequestURL(toGurl(originalRequestUrl)); entry->SetIsOverridingUserAgent(isOverridingUserAgent); -- cgit v1.2.3