From 9a5df9da418c7628303a357fb7aae722ee3ef29d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 22 Nov 2016 08:07:55 -0800
Subject: [PATCH] Expose setVisualZoomLevelLimits on webContents and <web-view>

---
 docs/api/web-contents.md          | 17 ++++++++++++++++-
 lib/browser/api/web-contents.js   |  2 ++
 lib/renderer/web-view/web-view.js |  2 ++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md
index eed5468510..ba0dcdfec2 100644
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -691,7 +691,22 @@ Sends a request to get current zoom level, the `callback` will be called with
 * `minimumLevel` Number
 * `maximumLevel` Number
 
-Sets the maximum and minimum zoom level.
+**Deprecated:** Call `setVisualZoomLevelLimits` instead to set the visual zoom
+level limits. This method will be removed in Electron 2.0.
+
+#### `contents.setVisualZoomLevelLimits(minimumLevel, maximumLevel)`
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Sets the maximum and minimum pinch-to-zoom level.
+
+#### `contents.setLayoutZoomLevelLimits(minimumLevel, maximumLevel)`
+
+* `minimumLevel` Number
+* `maximumLevel` Number
+
+Sets the maximum and minimum layout-based (i.e. non-visual) zoom level.
 
 #### `contents.undo()`
 
diff --git a/lib/browser/api/web-contents.js b/lib/browser/api/web-contents.js
index 7e359e6c2d..a02fddb7d0 100644
--- a/lib/browser/api/web-contents.js
+++ b/lib/browser/api/web-contents.js
@@ -101,8 +101,10 @@ WebContents.prototype.sendToAll = function (channel, ...args) {
 const webFrameMethods = [
   'insertText',
   'setLayoutZoomLevelLimits',
+  'setVisualZoomLevelLimits',
   'setZoomFactor',
   'setZoomLevel',
+  // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
   'setZoomLevelLimits'
 ]
 const webFrameMethodsWithResult = [
diff --git a/lib/renderer/web-view/web-view.js b/lib/renderer/web-view/web-view.js
index 59bbbd89b1..ba8ae32d46 100644
--- a/lib/renderer/web-view/web-view.js
+++ b/lib/renderer/web-view/web-view.js
@@ -391,8 +391,10 @@ var registerWebViewElement = function () {
     'send',
     'sendInputEvent',
     'setLayoutZoomLevelLimits',
+    'setVisualZoomLevelLimits',
     'setZoomFactor',
     'setZoomLevel',
+    // TODO(kevinsawicki): Remove in 2.0, deprecate before then with warnings
     'setZoomLevelLimits'
   ]