ImageCapture: wire PhotoCapabilities' ISO, width, height and PhotoSettings' width and height

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 20f9c370c1bdb7da1cf3dcbdefc665425f0b543d..3b7fccee47c33f7e1f4e798303acccb4bbfd7c0d 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
@@ -12,12 +12,32 @@ import org.chromium.base.annotations.JNINamespace;
  **/
 @JNINamespace("media")
 class PhotoCapabilities {
+    public final int maxIso;
+    public final int minIso;
+    public final int currentIso;
+    public final int maxHeight;
+    public final int minHeight;
+    public final int currentHeight;
+    public final int maxWidth;
+    public final int minWidth;
+    public final int currentWidth;
     public final int maxZoom;
     public final int minZoom;
     public final int currentZoom;
     public final boolean autoFocusInUse;
 
-    PhotoCapabilities(int maxZoom, int minZoom, int currentZoom, boolean autoFocusInUse) {
+    PhotoCapabilities(int maxIso, int minIso, int currentIso, int maxHeight, int minHeight,
+            int currentHeight, int maxWidth, int minWidth, int currentWidth, int maxZoom,
+            int minZoom, int currentZoom, boolean autoFocusInUse) {
+        this.maxIso = maxIso;
+        this.minIso = minIso;
+        this.currentIso = currentIso;
+        this.maxHeight = maxHeight;
+        this.minHeight = minHeight;
+        this.currentHeight = currentHeight;
+        this.maxWidth = maxWidth;
+        this.minWidth = minWidth;
+        this.currentWidth = currentWidth;
         this.maxZoom = maxZoom;
         this.minZoom = minZoom;
         this.currentZoom = currentZoom;
@@ -25,6 +45,51 @@ class PhotoCapabilities {
     }
 
     @CalledByNative
+    public int getMinIso() {
+        return minIso;
+    }
+
+    @CalledByNative
+    public int getMaxIso() {
+        return maxIso;
+    }
+
+    @CalledByNative
+    public int getCurrentIso() {
+        return currentIso;
+    }
+
+    @CalledByNative
+    public int getMinHeight() {
+        return minHeight;
+    }
+
+    @CalledByNative
+    public int getMaxHeight() {
+        return maxHeight;
+    }
+
+    @CalledByNative
+    public int getCurrentHeight() {
+        return currentHeight;
+    }
+
+    @CalledByNative
+    public int getMinWidth() {
+        return minWidth;
+    }
+
+    @CalledByNative
+    public int getMaxWidth() {
+        return maxWidth;
+    }
+
+    @CalledByNative
+    public int getCurrentWidth() {
+        return currentWidth;
+    }
+
+    @CalledByNative
     public int getMinZoom() {
         return minZoom;
     }