From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- chromium/content/public/browser/host_zoom_map.h | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'chromium/content/public/browser/host_zoom_map.h') diff --git a/chromium/content/public/browser/host_zoom_map.h b/chromium/content/public/browser/host_zoom_map.h index 72c9a1fb62f..e65b443d2b4 100644 --- a/chromium/content/public/browser/host_zoom_map.h +++ b/chromium/content/public/browser/host_zoom_map.h @@ -18,6 +18,7 @@ namespace content { class BrowserContext; class ResourceContext; +class WebContents; // Maps hostnames to custom zoom levels. Written on the UI thread and read on // any thread. One instance per browser context. Must be created on the UI @@ -49,9 +50,20 @@ class HostZoomMap { double zoom_level; }; + typedef std::vector ZoomLevelVector; + CONTENT_EXPORT static HostZoomMap* GetForBrowserContext( BrowserContext* browser_context); + // Returns the current zoom level for the specified WebContents. May be + // temporary or host-specific. + CONTENT_EXPORT static double GetZoomLevel(const WebContents* web_contents); + + // Sets the current zoom level for the specified WebContents. The level may + // be temporary or host-specific depending on the particular WebContents. + CONTENT_EXPORT static void SetZoomLevel(const WebContents* web_contents, + double level); + // Copy the zoom levels from the given map. Can only be called on the UI // thread. virtual void CopyFrom(HostZoomMap* copy) = 0; @@ -66,6 +78,16 @@ class HostZoomMap { const std::string& scheme, const std::string& host) const = 0; + // Returns true if the specified |scheme| and/or |host| has a zoom level + // currently set. + // + // This may be called on any thread. + virtual bool HasZoomLevel(const std::string& scheme, + const std::string& host) const = 0; + + // Returns all non-temporary zoom levels. Can be called on any thread. + virtual ZoomLevelVector GetAllZoomLevels() const = 0; + // Here |host| is the host portion of URL, or (in the absence of a host) // the complete spec of the URL. // Sets the zoom level for the |host| to |level|. If the level matches the @@ -87,6 +109,25 @@ class HostZoomMap { const std::string& host, double level) = 0; + // Returns whether the view manages its zoom level independently of other + // views displaying content from the same host. + virtual bool UsesTemporaryZoomLevel(int render_process_id, + int render_view_id) const = 0; + + // Sets the temporary zoom level that's only valid for the lifetime of this + // WebContents. + // + // This should only be called on the UI thread. + virtual void SetTemporaryZoomLevel(int render_process_id, + int render_view_id, + double level) = 0; + + // Clears the temporary zoom level stored for this WebContents. + // + // This should only be called on the UI thread. + virtual void ClearTemporaryZoomLevel(int render_process_id, + int render_view_id) = 0; + // Get/Set the default zoom level for pages that don't override it. virtual double GetDefaultZoomLevel() const = 0; virtual void SetDefaultZoomLevel(double level) = 0;; -- cgit v1.2.3