OOP PDF - Add support for "zoom" open pdf parameter

pdf/instance.cc

 // Copyright (c) 2012 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 "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 89 matching lines @@
 const char kJSZoomFitToWidth[] = "fitToWidth";
 const char kJSZoomIn[] = "zoomIn";
 const char kJSZoomOut[] = "zoomOut";
 
 // URL reference parameters.
 // For more possible parameters, see RFC 3778 and the "PDF Open Parameters"
 // document from Adobe.
 const char kDelimiters[] = "#&";
 const char kNamedDest[] = "nameddest";
 const char kPage[] = "page";
+const char kZoom[] = "zoom";
 
 const char kChromePrint[] = "chrome://print/";
 
 // Dictionary Value key names for the document accessibility info
 const char kAccessibleNumberOfPages[] = "numberOfPages";
 const char kAccessibleLoaded[] = "loaded";
 const char kAccessibleCopyable[] = "copyable";
 
 const ToolbarButtonInfo kPDFToolbarButtons[] = {
   { kFitToPageButtonId, Button::BUTTON_STATE,
@@ skipping 1379 matching lines @@
   UserMetricsRecordAction("PDF.LoadSuccess");
   if (on_load_callback_.is_string())
     ExecuteScript(on_load_callback_);
   // Note: If we are in print preview mode on_load_callback_ might call
   // ScrollTo{X|Y}() and we don't want to scroll again and override it.
   // #page=N is not supported in Print Preview.
   if (!IsPrintPreview()) {
     int initial_page = GetInitialPage(url_);
     if (initial_page >= 0)
       ScrollToPage(initial_page);
+
+    HandleOpenParameters(url_);

[Lei Zhang, 2014/07/30 02:43:20]

Please note there is another call to GetInitialPage() in this file.

   }
 
   if (!full_)
     return;
   if (!pp::PDF::IsAvailable())
     return;
 
   if (did_call_start_loading_) {
     pp::PDF::DidStopLoading(this);
     did_call_start_loading_ = false;
@@ skipping 796 matching lines @@
 
   const PPB_URLLoaderTrusted* trusted_interface =
       reinterpret_cast<const PPB_URLLoaderTrusted*>(
           pp::Module::Get()->GetBrowserInterface(
               PPB_URLLOADERTRUSTED_INTERFACE));
   if (trusted_interface)
     trusted_interface->GrantUniversalAccess(loader.pp_resource());
   return loader;
 }
 
+void Instance::HandleZoomParameter(const std::string& value) {

[raymes, 2014/07/30 01:10:15]

nit: value->url

+  std::vector<std::string> zoom_value;
+  base::SplitString(value, ',', &zoom_value);
+  // Only #zoom=scale or #zoom=scale,left,top are possible.
+  if ((zoom_value.size() != 1) && (zoom_value.size() != 3))
+    return;
+
+  const std::string& scale_string = zoom_value[0];
+  double scale_value;
+  base::StringToDouble(scale_string, &scale_value);
+  // User scale of 100 means zoom value of 100% i.e. zoom factor of 1.0.
+  double zoom_factor = (scale_value / 100);

[raymes, 2014/07/30 01:10:15]

no need for ()

+
+  if (zoom_value.size() == 1) {
+    // Handle #zoom=scale.
+    SetZoom(ZOOM_SCALE, zoom_factor);
+    return;
+  }
+
+  // Handle #zoom=scale,left,top.
+  const std::string& left_string = zoom_value[1];
+  int left_value;
+  base::StringToInt(left_string, &left_value);
+  const std::string& top_string = zoom_value[2];
+  int top_value;
+  base::StringToInt(top_string, &top_value);
+  ScrollToX(left_value);
+  ScrollToY(top_value);
+  SetZoom(ZOOM_SCALE, zoom_factor);
+}
+
+void Instance::HandleOpenParameters(const std::string& url) {

[Lei Zhang, 2014/07/30 02:43:21]

Isn't this duplicating a good chunk of the code right below in GetInitialPage()
?

+#if defined(OS_NACL)
+  return;
+#else

[raymes, 2014/07/30 01:10:15]

You probably don't need this ifdef. I don't think we build for NaCl anymore.

[Lei Zhang, 2014/07/30 02:43:21]

raymes: If that is indeed the case, would you mind cleaning it all up in a
separate CL? (In addition to not adding any new ones here.)

+  size_t found_idx = url.find('#');
+  if (found_idx == std::string::npos)
+    return;
+
+  const std::string& ref = url.substr(found_idx + 1);
+  std::vector<std::string> fragments;
+  Tokenize(ref, kDelimiters, &fragments);
+
+  for (size_t i = 0; i < fragments.size(); ++i) {

[Lei Zhang, 2014/07/30 02:43:20]

What you really want to do is to scan the fragments once. Then find the last
instance of #zoom and #page, and then just handle those in order.

+    std::vector<std::string> key_value;
+    base::SplitString(fragments[i], '=', &key_value);
+    if (key_value.size() != 2)
+      continue;
+    const std::string& key = key_value[0];
+    const std::string& value = key_value[1];
+
+    // Order is important as later actions can override effects
+    // of previous actions.
+    if (base::strcasecmp(kZoom, key.c_str()) == 0) {
+      HandleZoomParameter(value);
+      continue;
+    }
+  }
+#endif
+}
+
 int Instance::GetInitialPage(const std::string& url) {
 #if defined(OS_NACL)
   return -1;
 #else
   size_t found_idx = url.find('#');
   if (found_idx == std::string::npos)
     return -1;
 
   const std::string& ref = url.substr(found_idx + 1);
   std::vector<std::string> fragments;
@@ skipping 388 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf