Improved Pinch-Zoom for PDF.

pdf/out_of_process_instance.h

Index: pdf/out_of_process_instance.h
diff --git a/pdf/out_of_process_instance.h b/pdf/out_of_process_instance.h
index a998537dfd1e27548cf580d50715c68c928afb51..cb412ab7487605acc85e0be713d92a21da742e08 100644
--- a/pdf/out_of_process_instance.h
+++ b/pdf/out_of_process_instance.h
@@ -235,9 +235,29 @@ class OutOfProcessInstance : public pp::Instance,
   // there are 10 pages, the height will be 8000).
   pp::Size document_size_;
 
-  double zoom_;  // Current zoom factor.
+  // Enumeration of pinch states.
+  // This should match PinchPhase enum in
+  // chrome/browser/resources/pdf/viewport.js
+  enum PinchPhase {
+      PINCH_NONE = 0,

[Lei Zhang, 2016/10/27 23:04:33]

nit: 2 space indent.

[Kevin McNee - google account, 2016/10/28 19:19:37]

Done.

+      PINCH_START = 1,
+      PINCH_UPDATE_ZOOM_OUT = 2,
+      PINCH_UPDATE_ZOOM_IN = 3,
+      PINCH_END = 4
+  };
 
-  float device_scale_;  // Current device scale factor.
+  // Current zoom factor.
+  double zoom_;
+  double old_zoom_;
+  double initial_zoom_delta_;
+  // True if we request a new bitmap rendering.
+  bool needs_reraster_;
+  // Scroll at the beginning of zooming.
+  pp::FloatPoint last_current_scroll_;
+  // True if last bitmap was smaller than screen.
+  bool was_smaller_;
+  // Current device scale factor.
+  float device_scale_;
   // True if the plugin is full-page.
   bool full_;