Consistent content placement method for dom-distiller

ios/chrome/browser/dom_distiller/distiller_viewer.cc

 // Copyright 2015 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 "ios/chrome/browser/dom_distiller/distiller_viewer.h"
 
 #include <string>
 
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
@@ skipping 20 matching lines @@
 
   viewer_handle_ = distillerService->ViewUrl(
       this, distillerService->CreateDefaultDistillerPage(gfx::Size()), url);
 }
 
 DistillerViewer::~DistillerViewer() {
 }
 
 void DistillerViewer::OnArticleReady(
     const DistilledArticleProto* article_proto) {
-  const std::string html = viewer::GetUnsafeArticleHtml(
-      article_proto, distilled_page_prefs_->GetTheme(),
+  const std::string html = viewer::GetUnsafeArticleTemplateHtml(
+      &article_proto->pages(0), distilled_page_prefs_->GetTheme(),
       distilled_page_prefs_->GetFontFamily());
 
+  std::string content_js = viewer::GetUnsafeArticleContentJs(article_proto);
+  // TODO(mdjones): This needs to eventually be placed somewhere better than
+  // after the closing HTML tag.
+  html += "<script>" + content_js + "</script>";

[noyau (Ping after 24h), 2015/04/01 11:42:08]

This is definitely not the right way to do this.

The proper approach would be to change the DistillationFinishedCallback so it
takes both the HTML and the javascript to inject. This will require changes in
the client code that is not in chromium, so leave it there but with a
TODO(noyau) and an associated bug.

Note that on iOS the equivalent of content that is used to render the UI is not
created right away (the distillation may be happening in the background and only
if the user tap on a confirmation dialog will the webview be created). This
helps a lot with memory management (webviews are expensive).

[mdjones, 2015/04/01 22:25:33]

Done.

+
+
   callback_.Run(url_, html);
 
   // No need to hold on to the ViewerHandle now that distillation is complete.
   viewer_handle_.reset();
 }
 
 }  // namespace dom_distiller