PDF Viewer - PageUp/Down don't move pdf by page size in FitToPage mode

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 761 matching lines @@
 void Instance::SelectFindResult(bool forward) {
   engine_->SelectFindResult(forward);
 }
 
 void Instance::StopFind() {
   engine_->StopFind();
 }
 
 void Instance::Zoom(double scale, bool text_only) {
   UserMetricsRecordAction("PDF.ZoomFromBrowser");
   SetZoom(ZOOM_SCALE, scale);

[raymes, 2014/10/09 17:15:53]

Could we move the check up to before this line?

[wjmaclean, 2014/10/09 17:19:01]

This was my original thought, as then it only catches duplicates coming from the
renderer; no one else seems to call Zoom() internally.

[Nikhil, 2014/10/20 09:25:29]

Done.

 }
 
 void Instance::ZoomChanged(double factor) {
   if (full_)
     Zoom_Dev::ZoomChanged(factor);
 }
 
 void Instance::OnPaint(const std::vector<pp::Rect>& paint_rects,
                        std::vector<PaintManager::ReadyRect>* ready,
                        std::vector<pp::Rect>* pending) {
@@ skipping 1648 matching lines @@
   int32 doc_height = static_cast<int>(document_size_.height() * zoom_);
   pp::Point origin(
       plugin_size_.width() - page_indicator_.rect().width() -
           GetScaled(GetScrollbarReservedThickness()),
       page_indicator_.GetYPosition(engine_->GetVerticalScrollbarYPosition(),
                                    doc_height, plugin_size_.height()));
   page_indicator_.MoveTo(origin, invalidate);
 }
 
 void Instance::SetZoom(ZoomMode zoom_mode, double scale) {
+  // If the zoom level doesn't change it means that this zoom change might have
+  // been initiated by the plugin. In that case, we don't want to change the
+  // zoom mode to ZOOM_SCALE as it may have been intentionally set to
+  // ZOOM_FIT_TO_PAGE or some other value when the zoom was last changed.
+  if (scale == zoom_)
+    return;
+
   double old_zoom = zoom_;
 
   zoom_mode_ = zoom_mode;
   if (zoom_mode_ == ZOOM_SCALE)
     zoom_ = scale;
   UpdateZoomScale();
 
   engine_->ZoomUpdated(zoom_ * device_scale_);
   OnGeometryChanged(old_zoom, device_scale_);
 
@@ skipping 300 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