From f98137b2cc1311a9c9641ff7c92957dcde6ab02c Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 4 Sep 2012 21:19:56 +0000
Subject: [PATCH] Merge revision 759 changes: - Improve
 GetZoomLevel/SetZoomLevel documentation (issue #666).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@761 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/include/capi/cef_browser_capi.h | 6 ++++--
 cef1/include/cef_browser.h           | 6 ++++--
 cef3/include/capi/cef_browser_capi.h | 9 +++++++--
 cef3/include/cef_browser.h           | 8 ++++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/cef1/include/capi/cef_browser_capi.h b/cef1/include/capi/cef_browser_capi.h
index eccb3f3e9..1935f004b 100644
--- a/cef1/include/capi/cef_browser_capi.h
+++ b/cef1/include/capi/cef_browser_capi.h
@@ -180,12 +180,14 @@ typedef struct _cef_browser_t {
       int clearSelection);
 
   ///
-  // Get the zoom level.
+  // Get the current zoom level. The default zoom level is 0.0. This function
+  // can only be called on the UI thread.
   ///
   double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_t* self);
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the zoom
+  // level. The change will be applied asynchronously on the UI thread.
   ///
   void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_t* self,
       double zoomLevel);
diff --git a/cef1/include/cef_browser.h b/cef1/include/cef_browser.h
index b319bc1dd..f141732e3 100644
--- a/cef1/include/cef_browser.h
+++ b/cef1/include/cef_browser.h
@@ -208,13 +208,15 @@ class CefBrowser : public virtual CefBase {
   virtual void StopFinding(bool clearSelection) =0;
 
   ///
-  // Get the zoom level.
+  // Get the current zoom level. The default zoom level is 0.0. This method can
+  // only be called on the UI thread.
   ///
   /*--cef()--*/
   virtual double GetZoomLevel() =0;
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the
+  // zoom level. The change will be applied asynchronously on the UI thread.
   ///
   /*--cef()--*/
   virtual void SetZoomLevel(double zoomLevel) =0;
diff --git a/cef3/include/capi/cef_browser_capi.h b/cef3/include/capi/cef_browser_capi.h
index 10ba46f24..79c832494 100644
--- a/cef3/include/capi/cef_browser_capi.h
+++ b/cef3/include/capi/cef_browser_capi.h
@@ -114,7 +114,9 @@ typedef struct _cef_browser_t {
   ///
   int (CEF_CALLBACK *is_popup)(struct _cef_browser_t* self);
 
+  ///
   // Returns true (1) if a document has been loaded in the browser.
+  ///
   int (CEF_CALLBACK *has_document)(struct _cef_browser_t* self);
 
   ///
@@ -238,12 +240,15 @@ typedef struct _cef_browser_host_t {
       struct _cef_browser_host_t* self, int http_scheme);
 
   ///
-  // Get the zoom level. This function can only be called on the UI thread.
+  // Get the current zoom level. The default zoom level is 0.0. This function
+  // can only be called on the UI thread.
   ///
   double (CEF_CALLBACK *get_zoom_level)(struct _cef_browser_host_t* self);
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the zoom
+  // level. If called on the UI thread the change will be applied immediately.
+  // Otherwise, the change will be applied asynchronously on the UI thread.
   ///
   void (CEF_CALLBACK *set_zoom_level)(struct _cef_browser_host_t* self,
       double zoomLevel);
diff --git a/cef3/include/cef_browser.h b/cef3/include/cef_browser.h
index b54f7dda3..512ed24e1 100644
--- a/cef3/include/cef_browser.h
+++ b/cef3/include/cef_browser.h
@@ -273,13 +273,17 @@ class CefBrowserHost : public virtual CefBase {
   virtual CefString GetDevToolsURL(bool http_scheme) =0;
 
   ///
-  // Get the zoom level. This method can only be called on the UI thread.
+  // Get the current zoom level. The default zoom level is 0.0. This method can
+  // only be called on the UI thread.
   ///
   /*--cef()--*/
   virtual double GetZoomLevel() =0;
 
   ///
-  // Change the zoom level to the specified value.
+  // Change the zoom level to the specified value. Specify 0.0 to reset the
+  // zoom level. If called on the UI thread the change will be applied
+  // immediately. Otherwise, the change will be applied asynchronously on the
+  // UI thread.
   ///
   /*--cef()--*/
   virtual void SetZoomLevel(double zoomLevel) =0;