PageState: replace base::NullableString16 with Optional<base::string16>.
The long-term plan is to remove base::NullableString16 and just use
base::Optional<base::string16> directly.
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I43b994de70262326b0ca148d888b4424f9d4a795
Reviewed-on: https://chromium-review.googlesource.com/699860
Commit-Queue: Daniel Cheng <[email protected]>
Reviewed-by: Patrick Noland <[email protected]>
Reviewed-by: Jeremy Roman <[email protected]>
Reviewed-by: Charlie Reis <[email protected]>
Cr-Commit-Position: refs/heads/master@{#506970}diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
index 9d3a59c..e94e7bc 100644
--- a/content/renderer/history_serialization.cc
+++ b/content/renderer/history_serialization.cc
@@ -30,22 +30,23 @@
namespace content {
namespace {
-void ToNullableString16Vector(const WebVector<WebString>& input,
- std::vector<base::NullableString16>* output) {
+void ToOptionalString16Vector(
+ const WebVector<WebString>& input,
+ std::vector<base::Optional<base::string16>>* output) {
output->reserve(output->size() + input.size());
for (size_t i = 0; i < input.size(); ++i)
- output->push_back(WebString::ToNullableString16(input[i]));
+ output->emplace_back(WebString::ToOptionalString16(input[i]));
}
void GenerateFrameStateFromItem(const WebHistoryItem& item,
ExplodedFrameState* state) {
- state->url_string = WebString::ToNullableString16(item.UrlString());
- state->referrer = WebString::ToNullableString16(item.GetReferrer());
+ state->url_string = WebString::ToOptionalString16(item.UrlString());
+ state->referrer = WebString::ToOptionalString16(item.GetReferrer());
state->referrer_policy = item.GetReferrerPolicy();
- state->target = WebString::ToNullableString16(item.Target());
+ state->target = WebString::ToOptionalString16(item.Target());
if (!item.StateObject().IsNull()) {
state->state_object =
- WebString::ToNullableString16(item.StateObject().ToString());
+ WebString::ToOptionalString16(item.StateObject().ToString());
}
state->scroll_restoration_type = item.ScrollRestorationType();
state->visual_viewport_scroll_offset = item.VisualViewportScrollOffset();
@@ -54,10 +55,10 @@
state->document_sequence_number = item.DocumentSequenceNumber();
state->page_scale_factor = item.PageScaleFactor();
state->did_save_scroll_or_scale_state = item.DidSaveScrollOrScaleState();
- ToNullableString16Vector(item.GetDocumentState(), &state->document_state);
+ ToOptionalString16Vector(item.GetDocumentState(), &state->document_state);
state->http_body.http_content_type =
- WebString::ToNullableString16(item.HttpContentType());
+ WebString::ToOptionalString16(item.HttpContentType());
const WebHTTPBody& http_body = item.HttpBody();
if (!http_body.IsNull()) {
state->http_body.request_body = GetRequestBodyForWebHTTPBody(http_body);
@@ -65,22 +66,6 @@
}
}
-void RecursivelyGenerateFrameState(
- HistoryEntry::HistoryNode* node,
- ExplodedFrameState* state,
- std::vector<base::NullableString16>* referenced_files) {
- GenerateFrameStateFromItem(node->item(), state);
- ToNullableString16Vector(node->item().GetReferencedFilePaths(),
- referenced_files);
-
- std::vector<HistoryEntry::HistoryNode*> children = node->children();
- state->children.resize(children.size());
- for (size_t i = 0; i < children.size(); ++i) {
- RecursivelyGenerateFrameState(children[i], &state->children[i],
- referenced_files);
- }
-}
-
void RecursivelyGenerateHistoryItem(const ExplodedFrameState& state,
HistoryEntry::HistoryNode* node) {
WebHistoryItem item;
@@ -88,13 +73,14 @@
item.SetURLString(WebString::FromUTF16(state.url_string));
item.SetReferrer(WebString::FromUTF16(state.referrer), state.referrer_policy);
item.SetTarget(WebString::FromUTF16(state.target));
- if (!state.state_object.is_null()) {
+ if (state.state_object) {
item.SetStateObject(WebSerializedScriptValue::FromString(
- WebString::FromUTF16(state.state_object)));
+ WebString::FromUTF16(*state.state_object)));
}
WebVector<WebString> document_state(state.document_state.size());
std::transform(state.document_state.begin(), state.document_state.end(),
- document_state.begin(), [](const base::NullableString16& s) {
+ document_state.begin(),
+ [](const base::Optional<base::string16>& s) {
return WebString::FromUTF16(s);
});
item.SetDocumentState(document_state);
@@ -128,19 +114,9 @@
} // namespace
-PageState HistoryEntryToPageState(HistoryEntry* entry) {
- ExplodedPageState state;
- RecursivelyGenerateFrameState(entry->root_history_node(), &state.top,
- &state.referenced_files);
-
- std::string encoded_data;
- EncodePageState(state, &encoded_data);
- return PageState::CreateFromEncodedData(encoded_data);
-}
-
PageState SingleHistoryItemToPageState(const WebHistoryItem& item) {
ExplodedPageState state;
- ToNullableString16Vector(item.GetReferencedFilePaths(),
+ ToOptionalString16Vector(item.GetReferencedFilePaths(),
&state.referenced_files);
GenerateFrameStateFromItem(item, &state.top);
