Make command-zero reset page scale in addition to zoom level

content/browser/host_zoom_map_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_HOST_ZOOM_MAP_IMPL_H_
 #define CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 
 // HostZoomMap needs to be deleted on the UI thread because it listens
 // to notifications on there (and holds a NotificationRegistrar).
 class CONTENT_EXPORT HostZoomMapImpl : public NON_EXPORTED_BASE(HostZoomMap),
                                        public NotificationObserver {
  public:
   HostZoomMapImpl();
   ~HostZoomMapImpl() override;
 
   // HostZoomMap implementation:
+  void SetPageScaleFactorIsOneForView(
+      int render_process_id, int render_view_id, bool is_one) override;
+  void ClearPageScaleFactorIsOneForView(
+      int render_process_id, int render_view_id) override;
   void CopyFrom(HostZoomMap* copy) override;
   double GetZoomLevelForHostAndScheme(const std::string& scheme,
                                       const std::string& host) const override;
   // TODO(wjmaclean) Should we use a GURL here? crbug.com/384486
   bool HasZoomLevel(const std::string& scheme,
                     const std::string& host) const override;
   ZoomLevelVector GetAllZoomLevels() const override;
   void SetZoomLevelForHost(const std::string& host, double level) override;
   void SetZoomLevelForHostAndScheme(const std::string& scheme,
                                     const std::string& host,
                                     double level) override;
   bool UsesTemporaryZoomLevel(int render_process_id,
                               int render_view_id) const override;
   void SetTemporaryZoomLevel(int render_process_id,
                              int render_view_id,
                              double level) override;
 
   void ClearTemporaryZoomLevel(int render_process_id,
                                int render_view_id) override;
   double GetDefaultZoomLevel() const override;
   void SetDefaultZoomLevel(double level) override;
   scoped_ptr<Subscription> AddZoomLevelChangedCallback(
       const ZoomLevelChangedCallback& callback) override;
 
   // Returns the current zoom level for the specified WebContents. This may
   // be a temporary zoom level, depending on UsesTemporaryZoomLevel().
   double GetZoomLevelForWebContents(
       const WebContentsImpl& web_contents_impl) const;
 
+  bool PageScaleFactorIsOneForWebContents(
+      const WebContentsImpl& web_contents_impl) const;
+
   // Sets the zoom level for this WebContents. If this WebContents is using
   // a temporary zoom level, then level is only applied to this WebContents.
   // Otherwise, the level will be applied on a host level.
   void SetZoomLevelForWebContents(const WebContentsImpl& web_contents_impl,
                                   double level);
 
   // Sets the zoom level for the specified view. The level may be set for only
   // this view, or for the host, depending on UsesTemporaryZoomLevel().
   void SetZoomLevelForView(int render_process_id,
                            int render_view_id,
@@ skipping 34 matching lines @@
         : render_process_id(render_process_id),
           render_view_id(render_view_id) {}
     bool operator<(const RenderViewKey& other) const {
       return render_process_id < other.render_process_id ||
              ((render_process_id == other.render_process_id) &&
               (render_view_id < other.render_view_id));
     }
   };
 
   typedef std::map<RenderViewKey, double> TemporaryZoomLevels;
+  typedef std::map<RenderViewKey, bool> ViewPageScaleFactorsAreOne;
 
   double GetZoomLevelForHost(const std::string& host) const;
 
   // Non-locked versions for internal use. These should only be called within
   // a scope where a lock has been acquired.
   double GetZoomLevelForHostInternal(const std::string& host) const;
   double GetZoomLevelForHostAndSchemeInternal(const std::string& scheme,
                                               const std::string& host) const;
 
   // Notifies the renderers from this browser context to change the zoom level
   // for the specified host and scheme.
   // TODO(wjmaclean) Should we use a GURL here? crbug.com/384486
   void SendZoomLevelChange(const std::string& scheme,
                            const std::string& host,
                            double level);
 
   // Callbacks called when zoom level changes.
   base::CallbackList<void(const ZoomLevelChange&)>
       zoom_level_changed_callbacks_;
 
   // Copy of the pref data, so that we can read it on the IO thread.
   HostZoomLevels host_zoom_levels_;
   SchemeHostZoomLevels scheme_host_zoom_levels_;
   double default_zoom_level_;
 
+  // Page scale factor data for each renderer.
+  ViewPageScaleFactorsAreOne view_page_scale_factors_are_one_;
+
   // Don't expect more than a couple of tabs that are using a temporary zoom
   // level, so vector is fine for now.
   TemporaryZoomLevels temporary_zoom_levels_;
 
-  // Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and
-  // |temporary_zoom_levels_| to guarantee thread safety.
+  // Used around accesses to |host_zoom_levels_|, |default_zoom_level_|,
+  // |temporary_zoom_levels_|, and |view_page_scale_factors_are_one_| to
+  // guarantee thread safety.
   mutable base::Lock lock_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMapImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_HOST_ZOOM_MAP_IMPL_H_