MediaSettingsRange: s/long/double/ in MediaSettingsRange.idl and PhotoCapabilities.idl

media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java

Index: media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
diff --git a/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java b/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
index 7539ee31490a0a43a90b85f585540aba79652f78..1b392fffd5edd01de732ffdbb4f999e5f8646c89 100644
--- a/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
+++ b/media/capture/video/android/java/src/org/chromium/media/PhotoCapabilities.java
@@ -24,16 +24,16 @@ class PhotoCapabilities {
     public final int minWidth;
     public final int currentWidth;
     public final int stepWidth;
-    public final int maxZoom;
-    public final int minZoom;
-    public final int currentZoom;
-    public final int stepZoom;
+    public final float maxZoom;

[Reilly Grant (use Gerrit), 2016/11/09 21:16:55]

I think we should just use double everywhere.

[mcasas, 2016/11/09 22:44:14]

Done.

+    public final float minZoom;
+    public final float currentZoom;
+    public final float stepZoom;
     public final int focusMode;
     public final int exposureMode;
-    public final int maxExposureCompensation;
-    public final int minExposureCompensation;
-    public final int currentExposureCompensation;
-    public final int stepExposureCompensation;
+    public final float maxExposureCompensation;
+    public final float minExposureCompensation;
+    public final float currentExposureCompensation;
+    public final float stepExposureCompensation;
     public final int whiteBalanceMode;
     public final int fillLightMode;
     public final boolean redEyeReduction;
@@ -44,10 +44,10 @@ class PhotoCapabilities {
 
     PhotoCapabilities(int maxIso, int minIso, int currentIso, int stepIso, int maxHeight,
             int minHeight, int currentHeight, int stepHeight, int maxWidth, int minWidth,
-            int currentWidth, int stepWidth, int maxZoom, int minZoom, int currentZoom,
-            int stepZoom, int focusMode, int exposureMode, int maxExposureCompensation,
-            int minExposureCompensation, int currentExposureCompensation,
-            int stepExposureCompensation, int whiteBalanceMode, int fillLightMode,
+            int currentWidth, int stepWidth, float maxZoom, float minZoom, float currentZoom,
+            float stepZoom, int focusMode, int exposureMode, float maxExposureCompensation,
+            float minExposureCompensation, float currentExposureCompensation,
+            float stepExposureCompensation, int whiteBalanceMode, int fillLightMode,
             boolean redEyeReduction, int maxColorTemperature, int minColorTemperature,
             int currentColorTemperature, int stepColorTemperature) {
         this.maxIso = maxIso;
@@ -142,22 +142,22 @@ class PhotoCapabilities {
     }
 
     @CalledByNative
-    public int getMinZoom() {
+    public float getMinZoom() {
         return minZoom;
     }
 
     @CalledByNative
-    public int getMaxZoom() {
+    public float getMaxZoom() {
         return maxZoom;
     }
 
     @CalledByNative
-    public int getCurrentZoom() {
+    public float getCurrentZoom() {
         return currentZoom;
     }
 
     @CalledByNative
-    public int getStepZoom() {
+    public float getStepZoom() {
         return stepZoom;
     }
 
@@ -172,22 +172,22 @@ class PhotoCapabilities {
     }
 
     @CalledByNative
-    public int getMinExposureCompensation() {
+    public float getMinExposureCompensation() {
         return minExposureCompensation;
     }
 
     @CalledByNative
-    public int getMaxExposureCompensation() {
+    public float getMaxExposureCompensation() {
         return maxExposureCompensation;
     }
 
     @CalledByNative
-    public int getCurrentExposureCompensation() {
+    public float getCurrentExposureCompensation() {
         return currentExposureCompensation;
     }
 
     @CalledByNative
-    public int getStepExposureCompensation() {
+    public float getStepExposureCompensation() {
         return stepExposureCompensation;
     }
 
@@ -239,16 +239,16 @@ class PhotoCapabilities {
         public int minWidth;
         public int currentWidth;
         public int stepWidth;
-        public int maxZoom;
-        public int minZoom;
-        public int currentZoom;
-        public int stepZoom;
+        public float maxZoom;
+        public float minZoom;
+        public float currentZoom;
+        public float stepZoom;
         public int focusMode;
         public int exposureMode;
-        public int maxExposureCompensation;
-        public int minExposureCompensation;
-        public int currentExposureCompensation;
-        public int stepExposureCompensation;
+        public float maxExposureCompensation;
+        public float minExposureCompensation;
+        public float currentExposureCompensation;
+        public float stepExposureCompensation;
         public int whiteBalanceMode;
         public int fillLightMode;
         public boolean redEyeReduction;
@@ -319,22 +319,22 @@ class PhotoCapabilities {
             return this;
         }
 
-        public Builder setMaxZoom(int maxZoom) {
+        public Builder setMaxZoom(float maxZoom) {
             this.maxZoom = maxZoom;
             return this;
         }
 
-        public Builder setMinZoom(int minZoom) {
+        public Builder setMinZoom(float minZoom) {
             this.minZoom = minZoom;
             return this;
         }
 
-        public Builder setCurrentZoom(int currentZoom) {
+        public Builder setCurrentZoom(float currentZoom) {
             this.currentZoom = currentZoom;
             return this;
         }
 
-        public Builder setStepZoom(int stepZoom) {
+        public Builder setStepZoom(float stepZoom) {
             this.stepZoom = stepZoom;
             return this;
         }
@@ -349,22 +349,22 @@ class PhotoCapabilities {
             return this;
         }
 
-        public Builder setMaxExposureCompensation(int maxExposureCompensation) {
+        public Builder setMaxExposureCompensation(float maxExposureCompensation) {
             this.maxExposureCompensation = maxExposureCompensation;
             return this;
         }
 
-        public Builder setMinExposureCompensation(int minExposureCompensation) {
+        public Builder setMinExposureCompensation(float minExposureCompensation) {
             this.minExposureCompensation = minExposureCompensation;
             return this;
         }
 
-        public Builder setCurrentExposureCompensation(int currentExposureCompensation) {
+        public Builder setCurrentExposureCompensation(float currentExposureCompensation) {
             this.currentExposureCompensation = currentExposureCompensation;
             return this;
         }
 
-        public Builder setStepExposureCompensation(int stepExposureCompensation) {
+        public Builder setStepExposureCompensation(float stepExposureCompensation) {
             this.stepExposureCompensation = stepExposureCompensation;
             return this;
         }