Show template before distiller finishes

components/dom_distiller/core/viewer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/dom_distiller/core/viewer.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_writer.h"
@@ skipping 86 matching lines @@
 
 void EnsureNonEmptyContent(std::string* content) {
   UMA_HISTOGRAM_BOOLEAN("DomDistiller.PageHasDistilledData", !content->empty());
   if (content->empty()) {
     *content = l10n_util::GetStringUTF8(
         IDS_DOM_DISTILLER_VIEWER_NO_DATA_CONTENT);
   }
 }
 
 std::string ReplaceHtmlTemplateValues(
-    const std::string& title,
-    const std::string& textDirection,
-    const std::string& loading_indicator_class,
     const std::string& original_url,
     const DistilledPagePrefs::Theme theme,
     const DistilledPagePrefs::FontFamily font_family) {
   base::StringPiece html_template =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DOM_DISTILLER_VIEWER_HTML);
   // TODO(mdjones): Many or all of these substitutions can be placed on the
   // page via JavaScript.
   std::vector<std::string> substitutions;
-  substitutions.push_back(title);                                         // $1
 
   std::ostringstream css;
   std::ostringstream script;
 #if defined(OS_IOS)
   // On iOS the content is inlined as there is no API to detect those requests
   // and return the local data once a page is loaded.
   css << "<style>" << viewer::GetCss() << "</style>";
   script << "<script>\n" << viewer::GetJavaScript() << "\n</script>";
 #else
   css << "<link rel=\"stylesheet\" href=\"/" << kViewerCssPath << "\">";
   script << "<script src=\"" << kViewerJsPath << "\"></script>";
 #endif  // defined(OS_IOS)
-  substitutions.push_back(css.str());                                     // $2
-  substitutions.push_back(script.str());                                  // $3
+  substitutions.push_back(css.str());                                     // $1
+  substitutions.push_back(script.str());                                  // $2
 
   substitutions.push_back(GetThemeCssClass(theme) + " " +
-                          GetFontCssClass(font_family));                  // $4
-  substitutions.push_back(loading_indicator_class);                       // $5
-  substitutions.push_back(original_url);                                  // $6
+                          GetFontCssClass(font_family));                  // $3
+  substitutions.push_back(original_url);                                  // $4
   substitutions.push_back(
-      l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $7
-  substitutions.push_back(textDirection);                                 // $8
+      l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_VIEWER_VIEW_ORIGINAL));  // $5
 
   return ReplaceStringPlaceholders(html_template, substitutions, NULL);
 }
 
 }  // namespace
 
 namespace viewer {
 
 const std::string GetShowFeedbackFormJs() {
   base::StringValue question_val(
@@ skipping 31 matching lines @@
 const std::string GetErrorPageJs() {
   base::StringValue value(l10n_util::GetStringUTF8(
       IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT));
   std::string output;
   base::JSONWriter::Write(&value, &output);
   std::string page_update("addToPage(");
   page_update += output + ");";
   return page_update;
 }
 
+const std::string GetSetTitleJs(std::string& title) {
+  EnsureNonEmptyTitle(&title);
+  base::StringValue value(title);
+  std::string output;
+  base::JSONWriter::Write(&value, &output);
+  return "setTitle(" + output + ");";
+}
+
+const std::string GetSetTextDirectionJs(const std::string& direction) {
+  base::StringValue value(direction);
+  std::string output;
+  base::JSONWriter::Write(&value, &output);
+  return "setTextDirection(" + output + ");";
+}
+
 const std::string GetToggleLoadingIndicatorJs(const bool is_last_page) {
   if (is_last_page)
     return "showLoadingIndicator(true);";
   else
     return "showLoadingIndicator(false);";
 }
 
 const std::string GetUnsafeArticleTemplateHtml(
-    const DistilledPageProto* page_proto,
+    const std::string original_url,
     const DistilledPagePrefs::Theme theme,
     const DistilledPagePrefs::FontFamily font_family) {
-  DCHECK(page_proto);
-
-  std::string title = net::EscapeForHTML(page_proto->title());
-
-  EnsureNonEmptyTitle(&title);
-
-  std::string text_direction = page_proto->text_direction();
-  std::string original_url = page_proto->url();
-
-  return ReplaceHtmlTemplateValues(title, text_direction, "hidden",
-                                   original_url, theme, font_family);
+  return ReplaceHtmlTemplateValues(original_url, theme, font_family);
 }
 
 const std::string GetUnsafeArticleContentJs(
     const DistilledArticleProto* article_proto) {
   DCHECK(article_proto);
   std::ostringstream unsafe_output_stream;
   if (article_proto->pages_size() > 0 && article_proto->pages(0).has_html()) {
     for (int page_num = 0; page_num < article_proto->pages_size(); ++page_num) {
       unsafe_output_stream << article_proto->pages(page_num).html();
     }
   }
 
   std::string output(unsafe_output_stream.str());
   EnsureNonEmptyContent(&output);
   base::StringValue value(output);
   base::JSONWriter::Write(&value, &output);
   std::string page_update("addToPage(");
   page_update += output + ");";
   return page_update + GetToggleLoadingIndicatorJs(true);
 }
 
-const std::string GetErrorPageHtml(
-    const DistilledPagePrefs::Theme theme,
-    const DistilledPagePrefs::FontFamily font_family) {
-  std::string title = l10n_util::GetStringUTF8(
-      IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_TITLE);
-  return ReplaceHtmlTemplateValues(title, "auto", "hidden", "", theme,
-                                   font_family);
-}
-
 const std::string GetCss() {
   return ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_DISTILLER_CSS).as_string();
 }
 
 const std::string GetJavaScript() {
   return ResourceBundle::GetSharedInstance()
       .GetRawDataResource(IDR_DOM_DISTILLER_VIEWER_JS)
       .as_string();
 }
@@ skipping 40 matching lines @@
 }
 
 const std::string GetDistilledPageFontFamilyJs(
     DistilledPagePrefs::FontFamily font_family) {
   return "useFontFamily('" + GetJsFontFamily(font_family) + "');";
 }
 
 }  // namespace viewer
 
 }  // namespace dom_distiller