Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: chrome/browser/android/offline_pages/prerendering_offliner.cc

Issue 2683493002: Get signals working in the EXTRA_DATA section of MHTML (Closed)
Patch Set: Merge changelist with tip of tree Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/offline_pages/prerendering_offliner.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.cc b/chrome/browser/android/offline_pages/prerendering_offliner.cc
index a6564ad078d662af7b164c009e039d8dd89aa383..db341ef4c87b63951480215df3ff2f69ab5334b3 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.cc
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.cc
@@ -14,10 +14,19 @@
#include "components/offline_pages/core/background/save_page_request.h"
#include "components/offline_pages/core/client_namespace_constants.h"
#include "components/offline_pages/core/downloads/download_ui_adapter.h"
+#include "components/offline_pages/core/offline_page_feature.h"
#include "components/offline_pages/core/offline_page_model.h"
#include "content/public/browser/browser_context.h"
+#include "content/public/browser/mhtml_extra_parts.h"
#include "content/public/browser/web_contents.h"
+namespace {
+const char kContentType[] = "text/plain";
+const char kContentTransferEncodingBinary[] =
+ "Content-Transfer-Encoding: binary";
+const char kXHeaderForSignals[] = "X-Chrome-Loading-Metrics-Data: 1";
+} // namespace
+
namespace offline_pages {
PrerenderingOffliner::PrerenderingOffliner(
@@ -83,6 +92,24 @@ void PrerenderingOffliner::OnLoadPageDone(
else if (save_page_params.url != request.url())
save_page_params.original_url = request.url();
+ if (IsOfflinePagesLoadSignalCollectingEnabled()) {
+ // Stash loading signals for writing when we write out the MHTML.
+ std::string headers =
+ base::StringPrintf("%s\r\n%s\r\n\r\n", kContentTransferEncodingBinary,
+ kXHeaderForSignals);
+ std::string body = headers + SerializeLoadingSignalData();
+ std::string content_type = kContentType;
+ std::string content_location = base::StringPrintf(
+ "cid:signal-data-%" PRId64 "@mhtml.blink", request.request_id());
+
+ content::MHTMLExtraParts* extra_parts =
+ content::MHTMLExtraParts::FromWebContents(web_contents);
+ DCHECK(extra_parts);
+ if (extra_parts != nullptr) {
+ extra_parts->AddExtraMHTMLPart(content_type, content_location, body);
+ }
+ }
+
SavePage(save_page_params, std::move(archiver),
base::Bind(&PrerenderingOffliner::OnSavePageDone,
weak_ptr_factory_.GetWeakPtr(), request));
@@ -94,6 +121,19 @@ void PrerenderingOffliner::OnLoadPageDone(
}
}
+std::string PrerenderingOffliner::SerializeLoadingSignalData() {
+ // Write the signal data into a single string.
+ std::string signal_string;
+ const std::vector<std::string>& signals = loader_->GetLoadingSignalData();
+
+ // TODO(petewil): Convert this to JSON, use json_writer.h
+ for (std::string signal : signals) {
+ signal_string += signal;
+ signal_string += "\n";
+ }
+ return signal_string;
+}
+
void PrerenderingOffliner::OnSavePageDone(
const SavePageRequest& request,
SavePageResult save_result,

Powered by Google App Engine
This is Rietveld 408576698