Image Capture: prune Photo{Capabilities/Settings} and add MediaTrackConstraintSet.pointsOfInterest

third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h

Index: third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
diff --git a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
index 45a9ac16a891b3ba9da008c415d7f0168526fcdc..5d4595800c6421b34789ad68937b9d6a94805d4c 100644
--- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
+++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
@@ -21,40 +21,12 @@ class PhotoCapabilities final
   static PhotoCapabilities* create();
   virtual ~PhotoCapabilities() = default;
 
-  MediaSettingsRange* iso() const { return m_iso; }
-  void setIso(MediaSettingsRange* value) { m_iso = value; }
-
   MediaSettingsRange* imageHeight() const { return m_imageHeight; }
   void setImageHeight(MediaSettingsRange* value) { m_imageHeight = value; }
 
   MediaSettingsRange* imageWidth() const { return m_imageWidth; }
   void setImageWidth(MediaSettingsRange* value) { m_imageWidth = value; }
 
-  MediaSettingsRange* zoom() const { return m_zoom; }
-  void setZoom(MediaSettingsRange* value) { m_zoom = value; }
-
-  String focusMode() const;
-  void setFocusMode(media::mojom::blink::MeteringMode focusMode) {
-    m_focusMode = focusMode;
-  }
-
-  String exposureMode() const;
-  void setExposureMode(media::mojom::blink::MeteringMode exposureMode) {
-    m_exposureMode = exposureMode;
-  }
-
-  MediaSettingsRange* exposureCompensation() const {
-    return m_exposureCompensation;
-  }
-  void setExposureCompensation(MediaSettingsRange* value) {
-    m_exposureCompensation = value;
-  }
-
-  String whiteBalanceMode() const;
-  void setWhiteBalanceMode(media::mojom::blink::MeteringMode whiteBalanceMode) {
-    m_whiteBalanceMode = whiteBalanceMode;
-  }
-
   String fillLightMode() const;
   void setFillLightMode(media::mojom::blink::FillLightMode fillLightMode) {
     m_fillLightMode = fillLightMode;
@@ -65,47 +37,16 @@ class PhotoCapabilities final
     m_redEyeReduction = redEyeReduction;
   }
 
-  MediaSettingsRange* colorTemperature() const { return m_colorTemperature; }
-  void setColorTemperature(MediaSettingsRange* value) {
-    m_colorTemperature = value;
-  }
-
-  MediaSettingsRange* brightness() const { return m_brightness; }
-  void setBrightness(MediaSettingsRange* value) { m_brightness = value; }
-
-  MediaSettingsRange* contrast() const { return m_contrast; }
-  void setContrast(MediaSettingsRange* value) { m_contrast = value; }
-
-  MediaSettingsRange* saturation() const { return m_saturation; }
-  void setSaturation(MediaSettingsRange* value) { m_saturation = value; }
-
-  MediaSettingsRange* sharpness() const { return m_sharpness; }
-  void setSharpness(MediaSettingsRange* value) { m_sharpness = value; }
-
   DECLARE_VIRTUAL_TRACE();
 
  private:
   PhotoCapabilities() = default;
 
-  Member<MediaSettingsRange> m_iso;
   Member<MediaSettingsRange> m_imageHeight;
   Member<MediaSettingsRange> m_imageWidth;
-  Member<MediaSettingsRange> m_zoom;
-  media::mojom::blink::MeteringMode m_focusMode =
-      media::mojom::blink::MeteringMode::NONE;
-  media::mojom::blink::MeteringMode m_exposureMode =
-      media::mojom::blink::MeteringMode::NONE;
-  Member<MediaSettingsRange> m_exposureCompensation;
-  media::mojom::blink::MeteringMode m_whiteBalanceMode =
-      media::mojom::blink::MeteringMode::NONE;
   media::mojom::blink::FillLightMode m_fillLightMode =
       media::mojom::blink::FillLightMode::NONE;
   bool m_redEyeReduction;
-  Member<MediaSettingsRange> m_colorTemperature;
-  Member<MediaSettingsRange> m_brightness;
-  Member<MediaSettingsRange> m_contrast;
-  Member<MediaSettingsRange> m_saturation;
-  Member<MediaSettingsRange> m_sharpness;
 };
 
 }  // namespace blink