ImageCapture: Implement focus mode for Android and Fake Video Capture Devices

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 0d5afdcb376619c15aee6b2717c268d9af00fb5c..307b50496669881cfb68b93051fa791294961c47 100644
--- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
+++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.h
@@ -6,6 +6,7 @@
 #define PhotoCapabilities_h
 
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "media/mojo/interfaces/image_capture.mojom-blink.h"
 #include "modules/imagecapture/MediaSettingsRange.h"
 #include "wtf/text/WTFString.h"
 
@@ -16,24 +17,22 @@ class PhotoCapabilities final
     , public ScriptWrappable {
     DEFINE_WRAPPERTYPEINFO();
 public:
-    static PhotoCapabilities* create()
-    {
-        return new PhotoCapabilities();
-    }
+    static PhotoCapabilities* create();
     virtual ~PhotoCapabilities() = default;
 
-    MediaSettingsRange* zoom() const { return m_zoom; }
-    void setZoom(MediaSettingsRange* value) { m_zoom = value; }
+    MediaSettingsRange* zoom() const;
+    void setZoom(MediaSettingsRange* value);
 
-    DEFINE_INLINE_TRACE()
-    {
-        visitor->trace(m_zoom);
-    }
+    String focusMode() const;
+    void setFocusMode(media::mojom::blink::FocusMode);
+
+    DECLARE_VIRTUAL_TRACE();
 
 private:
     PhotoCapabilities() = default;
 
     Member<MediaSettingsRange> m_zoom;
+    media::mojom::blink::FocusMode m_focusMode;

[dcheng, 2016/07/12 04:24:59]

Does the new field need to be initialized somewhere?

[mcasas, 2016/07/12 15:32:11]

Done.

 };
 
 } // namespace blink