PDF Viewer pinch zoom: Update state for zoom in following a zoom out.

pdf/out_of_process_instance.h

 // 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.
 
 #ifndef PDF_OUT_OF_PROCESS_INSTANCE_H_
 #define PDF_OUT_OF_PROCESS_INSTANCE_H_
 
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 231 matching lines @@
   enum PinchPhase {
     PINCH_NONE = 0,
     PINCH_START = 1,
     PINCH_UPDATE_ZOOM_OUT = 2,
     PINCH_UPDATE_ZOOM_IN = 3,
     PINCH_END = 4
   };
 
   // Current zoom factor.
   double zoom_;
-  double initial_zoom_ratio_;
   // True if we request a new bitmap rendering.
   bool needs_reraster_;
-  // Scroll position at the start of a pinch zoom.
-  pp::FloatPoint starting_scroll_offset_;
+  // The scroll position for the last raster, before any transformations are
+  // applied.
+  pp::FloatPoint scroll_offset_at_last_raster_;
   // True if last bitmap was smaller than screen.
   bool last_bitmap_smaller_;
   // Current device scale factor.
   float device_scale_;
   // True if the plugin is full-page.
   bool full_;
 
   PaintManager paint_manager_;
 
   struct BackgroundPart {
@@ skipping 122 matching lines @@
 
   // True if the plugin is loaded in print preview, otherwise false.
   bool is_print_preview_;
 
   DISALLOW_COPY_AND_ASSIGN(OutOfProcessInstance);
 };
 
 }  // namespace chrome_pdf
 
 #endif  // PDF_OUT_OF_PROCESS_INSTANCE_H_