Re-implement PageState serialization without a Blink API dependency.

content/public/renderer/history_item_serialization.cc

Index: content/public/renderer/history_item_serialization.cc
diff --git a/content/public/renderer/history_item_serialization.cc b/content/public/renderer/history_item_serialization.cc
index d8fcdc9eff80b0d7d736922fe3f2195808024414..80c305e9854b8d7ef9e9f67e8c05c36c5f16d5ac 100644
--- a/content/public/renderer/history_item_serialization.cc
+++ b/content/public/renderer/history_item_serialization.cc
@@ -4,18 +4,202 @@
 
 #include "content/public/renderer/history_item_serialization.h"
 
+#include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
-#include "webkit/glue/glue_serialize_deprecated.h"
+#include "third_party/WebKit/public/platform/WebHTTPBody.h"
+#include "third_party/WebKit/public/platform/WebPoint.h"
+#include "third_party/WebKit/public/platform/WebString.h"
+#include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/WebKit/public/web/WebHistoryItem.h"
+#include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
+
+using WebKit::WebHTTPBody;
+using WebKit::WebHistoryItem;
+using WebKit::WebSerializedScriptValue;
+using WebKit::WebString;
+using WebKit::WebVector;
 
 namespace content {
+namespace {
+
+void ToNullableString16Vector(const WebVector<WebString>& input,
+                              std::vector<base::NullableString16>* output) {
+  output->reserve(input.size());
+  for (size_t i = 0; i < input.size(); ++i)
+    output->push_back(input[i]);
+}
+
+void ToExplodedHttpBodyElement(const WebHTTPBody::Element& input,
+                               ExplodedHttpBodyElement* output) {
+  switch (input.type) {
+    case WebHTTPBody::Element::TypeData:
+      output->data.assign(input.data.data(), input.data.size());
+      break;
+    case WebHTTPBody::Element::TypeFile:
+      output->file_path = input.filePath;
+      output->file_start = input.fileStart;
+      output->file_length = input.fileLength;
+      output->file_modification_time = input.modificationTime;
+      break;
+    case WebHTTPBody::Element::TypeURL:
+      output->url = input.url;
+      output->file_start = input.fileStart;
+      output->file_length = input.fileLength;
+      output->file_modification_time = input.modificationTime;
+      break;
+    case WebHTTPBody::Element::TypeBlob:
+      output->url = input.url;
+      break;
+  }
+}
+
+void AppendHTTPBodyElement(const ExplodedHttpBodyElement& element,
+                           WebHTTPBody* http_body) {
+  switch (element.type) {
+    case WebHTTPBody::Element::TypeData:
+      http_body->appendData(element.data);
+      break;
+    case WebHTTPBody::Element::TypeFile:
+      http_body->appendFileRange(
+          element.file_path,
+          element.file_start,
+          element.file_length,
+          element.file_modification_time);
+      break;
+    case WebHTTPBody::Element::TypeURL:
+      http_body->appendURLRange(
+          element.url,
+          element.file_start,
+          element.file_length,
+          element.file_modification_time);
+      break;
+    case WebHTTPBody::Element::TypeBlob:
+      http_body->appendBlob(element.url);
+      break;
+  }
+}
+
+bool RecursivelyGenerateFrameState(const WebHistoryItem& item,
+                                   ExplodedFrameState* state) {
+  state->url_string = item.urlString();
+  state->original_url_string = item.originalURLString();
+  state->referrer = item.referrer();
+  state->target = item.target();
+  state->parent = item.parent();
+  state->title = item.title();
+  state->alternate_title = item.alternateTitle();
+  if (!item.stateObject().isNull())
+    state->state_object = item.stateObject().toString();
+  state->scroll_offset = item.scrollOffset();
+  state->item_sequence_number = item.itemSequenceNumber();
+  state->document_sequence_number =
+      item.documentSequenceNumber();
+  state->visit_count = item.visitCount();
+  state->visited_time = item.lastVisitedTime();
+  state->page_scale_factor = item.pageScaleFactor();
+  state->is_target_item = item.isTargetItem();
+  ToNullableString16Vector(item.documentState(), &state->document_state);
+
+  state->http_body.http_content_type = item.httpContentType();
+  const WebHTTPBody& http_body = item.httpBody();
+  if (!(state->http_body.is_null = http_body.isNull())) {
+    state->http_body.identifier = http_body.identifier();
+    state->http_body.elements.resize(http_body.elementCount());
+    for (size_t i = 0; i < http_body.elementCount(); ++i) {
+      WebHTTPBody::Element element;
+      http_body.elementAt(i, element);
+      ToExplodedHttpBodyElement(element, &state->http_body.elements[i]);
+    }
+    state->http_body.contains_passwords = http_body.containsPasswordData();
+  }
+
+  const WebVector<WebHistoryItem>& children = item.children();
+  state->children.resize(children.size());
+  for (size_t i = 0; i < children.size(); ++i) {
+    if (!RecursivelyGenerateFrameState(children[i], &state->children[i]))
+      return false;
+  }
+
+  return true;
+}
 
-PageState HistoryItemToPageState(const WebKit::WebHistoryItem& item) {
-  return PageState::CreateFromEncodedData(
-      webkit_glue::HistoryItemToString(item));
+bool RecursivelyGenerateHistoryItem(const ExplodedFrameState& state,
+                                    WebHistoryItem* item) {
+  item->setURLString(state.url_string);
+  item->setOriginalURLString(state.original_url_string);
+  item->setReferrer(state.referrer);
+  item->setTarget(state.target);
+  item->setParent(state.parent);
+  item->setTitle(state.title);
+  item->setAlternateTitle(state.alternate_title);
+  if (!state.state_object.is_null()) {
+    item->setStateObject(
+        WebSerializedScriptValue::fromString(state.state_object));
+  }
+  item->setDocumentState(state.document_state);
+  item->setScrollOffset(state.scroll_offset);
+  item->setVisitCount(state.visit_count);
+  item->setLastVisitedTime(state.visited_time);
+  item->setPageScaleFactor(state.page_scale_factor);
+  item->setIsTargetItem(state.is_target_item);
+
+  // These values are generated at WebHistoryItem construction time, and we
+  // only want to override those new values with old values if the old values
+  // are defined.  A value of 0 means undefined in this context.
+  if (state.item_sequence_number)
+    item->setItemSequenceNumber(state.item_sequence_number);
+  if (state.document_sequence_number)
+    item->setDocumentSequenceNumber(state.document_sequence_number);
+
+  item->setHTTPContentType(state.http_body.http_content_type);
+  if (!state.http_body.is_null) {
+    WebHTTPBody http_body;
+    http_body.initialize();
+    http_body.setIdentifier(state.http_body.identifier);
+    for (size_t i = 0; i < state.http_body.elements.size(); ++i)
+      AppendHTTPBodyElement(state.http_body.elements[i], &http_body);
+    item->setHTTPBody(http_body);
+  }
+
+  for (size_t i = 0; i < state.children.size(); ++i) {
+    WebHistoryItem child_item;
+    child_item.initialize();
+    if (!RecursivelyGenerateHistoryItem(state.children[i], &child_item))
+      return false;
+    item->appendToChildren(child_item);
+  }
+
+  return true;
+}
+
+}  // namespace
+
+PageState HistoryItemToPageState(const WebHistoryItem& item) {
+  ExplodedPageState state;
+  ToNullableString16Vector(item.getReferencedFilePaths(),
+                           &state.referenced_files);
+
+  if (!RecursivelyGenerateFrameState(item, &state.top))
+    return PageState();
+
+  std::string encoded_data;
+  if (!EncodePageState(state, &encoded_data))
+    return PageState();
+
+  return PageState::CreateFromEncodedData(encoded_data);
 }
 
-WebKit::WebHistoryItem PageStateToHistoryItem(const PageState& state) {
-  return webkit_glue::HistoryItemFromString(state.ToEncodedData());
+WebHistoryItem PageStateToHistoryItem(const PageState& page_state) {
+  ExplodedPageState state;
+  if (!DecodePageState(page_state.ToEncodedData(), &state))
+    return WebHistoryItem();
+
+  WebHistoryItem item;
+  item.initialize();
+  if (!RecursivelyGenerateHistoryItem(state.top, &item))
+    return WebHistoryItem();
+
+  return item;
 }
 
 }  // namespace content