Font size in DomDistiller prefs syncs with local scaling

components/dom_distiller/content/browser/dom_distiller_viewer_source.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/content/browser/dom_distiller_viewer_source.h"
 
-#include <sstream>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/user_metrics.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/external_feedback_reporter.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/dom_distiller_request_view_base.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/experiments.h"
 #include "components/dom_distiller/core/feedback_reporter.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
@@ skipping 135 matching lines @@
       SendJavaScript(viewer::GetShowFeedbackFormJs());
     }
     Cancel(); // This will cause the object to clean itself up.
     return;
   }
 
   if (render_frame_host->GetParent()) {
     return;
   }
   waiting_for_page_ready_ = false;
+  SendJavaScript(viewer::GetDistilledPageFontScalingJs(
+      distilled_page_prefs_->GetFontScaling()));
   if (buffer_.empty()) {
     return;
   }
   RunIsolatedJavaScript(web_contents()->GetMainFrame(), buffer_);
   buffer_.clear();
 }
 
 DomDistillerViewerSource::DomDistillerViewerSource(
     DomDistillerServiceInterface* dom_distiller_service,
     const std::string& scheme,
@@ skipping 38 matching lines @@
       return;
     content::WebContents* contents =
         content::WebContents::FromRenderFrameHost(render_frame_host);
     external_feedback_reporter_->ReportExternalFeedback(
         contents, contents->GetURL(), false);
     return;
   } else if (kFeedbackGood == path) {
     FeedbackReporter::ReportQuality(true);
     callback.Run(NULL);
     return;
+  } else if (base::StartsWith(path, kViewerSaveFontScalingPath,
+                              base::CompareCase::SENSITIVE)) {
+    double scale = 1.0;
+    base::StringToDouble(

[nyquist, 2015/08/11 06:27:56]

Should we do something if base::StringToDouble returns false?

[wychen, 2015/08/31 21:47:39]

Done.

+        path.substr(strlen(kViewerSaveFontScalingPath)), &scale);
+    dom_distiller_service_->GetDistilledPagePrefs()->SetFontScaling(scale);
+    callback.Run(NULL);
+    return;
   }
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
   DCHECK(web_contents);
   // An empty |path| is invalid, but guard against it. If not empty, assume
   // |path| starts with '?', which is stripped away.
   const std::string path_after_query_separator =
       path.size() > 0 ? path.substr(1) : "";
   RequestViewerHandle* request_viewer_handle =
       new RequestViewerHandle(web_contents, scheme_, path_after_query_separator,
@@ skipping 47 matching lines @@
 std::string DomDistillerViewerSource::GetContentSecurityPolicyObjectSrc()
     const {
   return "object-src 'none'; style-src 'self' https://fonts.googleapis.com;";
 }
 
 std::string DomDistillerViewerSource::GetContentSecurityPolicyFrameSrc() const {
   return "frame-src *;";
 }
 
 }  // namespace dom_distiller