Zoom Extension API (content changes)

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 17 matching lines @@
                                        public base::SupportsUserData::Data {
  public:
   HostZoomMapImpl();
   virtual ~HostZoomMapImpl();
 
   // HostZoomMap implementation:
   virtual void CopyFrom(HostZoomMap* copy) OVERRIDE;
   virtual double GetZoomLevelForHostAndScheme(
       const std::string& scheme,
       const std::string& host) const OVERRIDE;
+  virtual bool HasZoomLevel(const std::string& scheme,
+                            const std::string& host) const OVERRIDE;
   virtual ZoomLevelVector GetAllZoomLevels() const OVERRIDE;
   virtual void SetZoomLevelForHost(
       const std::string& host,
       double level) OVERRIDE;
   virtual void SetZoomLevelForHostAndScheme(
       const std::string& scheme,
       const std::string& host,
       double level) OVERRIDE;
+  virtual bool UsesTemporaryZoomLevel(int render_process_id,
+                                      int render_view_id) const OVERRIDE;
+  virtual void SetTemporaryZoomLevel(int render_process_id,

[Fady Samuel, 2014/06/10 20:05:13]

Alphabetize. 

[wjmaclean, 2014/06/10 20:18:54]

Everything, or just the newly added stuff?

+                                     int render_view_id,
+                                     double level) OVERRIDE;
+  virtual void SendTemporaryZoomLevelChange(int render_process_id,
+                                            int render_view_id) const OVERRIDE;
+
+  virtual void ClearTemporaryZoomLevel(int render_process_id,
+                                       int render_view_id) OVERRIDE;
   virtual double GetDefaultZoomLevel() const OVERRIDE;
   virtual void SetDefaultZoomLevel(double level) OVERRIDE;
   virtual 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;
 
   // 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,
                            double level,
                            const std::string& host);
 
-  // Returns whether the view manages its zoom level independently of other tabs
-  // displaying content from the same host.
-  bool UsesTemporaryZoomLevel(int render_process_id, int render_view_id) const;
 
   // Sets whether the view manages its zoom level independently of other tabs
   // displaying content from the same host, based on whether
   // |uses_temporary_zoom_level| is true.
   void SetUsesTemporaryZoomLevel(int render_process_id,
                                  int render_view_id,
                                  bool uses_temporary_zoom_level);
 
   // Returns the temporary zoom level that's only valid for the lifetime of
   // the given WebContents (i.e. isn't saved and doesn't affect other
   // WebContentses) if it exists, the default zoom level otherwise.
   //
   // This may be called on any thread.
   double GetTemporaryZoomLevel(int render_process_id,
                                int render_view_id) const;
 
-  // Sets the temporary zoom level that's only valid for the lifetime of this
-  // WebContents.
-  //
-  // This should only be called on the UI thread.
-  void SetTemporaryZoomLevel(int render_process_id,
-                             int render_view_id,
-                             double level);
-
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
  private:
   typedef std::map<std::string, double> HostZoomLevels;
   typedef std::map<std::string, HostZoomLevels> SchemeHostZoomLevels;
 
   struct TemporaryZoomLevel {
     TemporaryZoomLevel(int process_id, int view_id, double level);
     TemporaryZoomLevel(int process_id, int view_id);
     bool operator==(const TemporaryZoomLevel& other) const;
 
     int render_process_id;
     int render_view_id;
     double zoom_level;
   };
 
   typedef std::vector<TemporaryZoomLevel> TemporaryZoomLevels;
 
   double GetZoomLevelForHost(const std::string& host) const;
 
+  // Notifies the renderers from this browser context to change the zoom level
+  // for the specified host and scheme.
+  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_;
 
   // 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_;

[Fady Samuel, 2014/06/10 20:05:13]

This is a pretty bad data structure to use as we're making temporary zoom a more
prominent feature by exposing an extension API.

proposal: 

struct RenderViewKey {
  int render_process_id;
  int render_view_id;
  RenderViewKey(int render_process_id, int render_view_id)
      : 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> TemporaryZoomMap;

[wjmaclean, 2014/06/10 20:18:54]

Done.

 
   // Used around accesses to |host_zoom_levels_|, |default_zoom_level_| and
   // |temporary_zoom_levels_| 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_