Made page zoom handling work with smooth scroll devices

content/browser/web_contents/web_contents_impl.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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 1162 matching lines @@
   // the WebContents creation time.
   base::TimeTicks last_active_time_;
 
   // See description above setter.
   bool closed_by_user_gesture_;
 
   // Minimum/maximum zoom percent.
   int minimum_zoom_percent_;
   int maximum_zoom_percent_;
 
+  // Used to correctly handle integer zooming through a smooth scroll device.
+  float zoom_scroll_amount_;

[Avi (use Gerrit), 2016/01/05 01:46:24]

This holds the non-integer portion of the zoom. Maybe |zoom_scroll_remainder_|?
Or something else that indicates that it's a portion of the zoom scroll amount,
not the whole thing.

[Will Shackleton, 2016/01/05 21:50:05]

Done.

+
   // The intrinsic size of the page.
   gfx::Size preferred_size_;
 
   // The preferred size for content screen capture.  When |capturer_count_| > 0,
   // this overrides |preferred_size_|.
   gfx::Size preferred_size_for_capture_;
 
 #if defined(OS_ANDROID) && !defined(USE_AURA)
   // Date time chooser opened by this tab.
   // Only used in Android since all other platforms use a multi field UI.
@@ skipping 123 matching lines @@
   // Adds/removes a callback called on creation of each new WebContents.
   static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
   static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
 
   DISALLOW_COPY_AND_ASSIGN(FriendZone);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_