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

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

Index: third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
diff --git a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
index c1d7ffd5b92c9815904fe8466885f04ff7ce2000..746a33dffc4a946c8a4abd47841ed3a2f689abaa 100644
--- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
+++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
@@ -12,6 +12,18 @@ PhotoCapabilities* PhotoCapabilities::create()
     return new PhotoCapabilities();
 }
 
+MediaSettingsRange* PhotoCapabilities::iso() const { return m_iso; }

[dcheng, 2016/07/22 04:45:29]

FWIW, simple setters and getters are usually inlined into the header in Blink.

[mcasas, 2016/07/22 16:46:32]

I think peter@ mentioned a while ago that I should
try and keep all accesors/mutators together, and,
given the focusMode(), they're all pushed here. WDYT?

[dcheng, 2016/07/22 18:07:23]

The inlining isn't for organization; it's for codegen.

It's not a hard rule, but it is the convention throughout basically the rest of
the codebase. I don't see a reason not to follow it here.

[mcasas, 2016/07/22 23:16:27]

Done.

+
+void PhotoCapabilities::setIso(MediaSettingsRange* value) { m_iso = value; }
+
+MediaSettingsRange* PhotoCapabilities::imageHeight() const { return m_imageHeight; }
+
+void PhotoCapabilities::setImageHeight(MediaSettingsRange* value) { m_imageHeight = value; }
+
+MediaSettingsRange* PhotoCapabilities::imageWidth() const { return m_imageWidth; }
+
+void PhotoCapabilities::setImageWidth(MediaSettingsRange* value) { m_imageWidth = value; }
+
 MediaSettingsRange* PhotoCapabilities::zoom() const { return m_zoom; }
 
 void PhotoCapabilities::setZoom(MediaSettingsRange* value) { m_zoom = value; }
@@ -38,6 +50,9 @@ void PhotoCapabilities::setFocusMode(media::mojom::blink::FocusMode focusMode)
 
 DEFINE_TRACE(PhotoCapabilities)
 {
+    visitor->trace(m_iso);
+    visitor->trace(m_imageHeight);
+    visitor->trace(m_imageWidth);
     visitor->trace(m_zoom);
 }