| 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 695fece3b4d0dc788324ea2960a21f96115d8b9b..a63724aa65667eee0bd24d51f6e5c49b1cfc20fb 100644
|
| --- a/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
|
| +++ b/third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp
|
| @@ -6,22 +6,18 @@
|
|
|
| namespace blink {
|
|
|
| -// static
|
| -PhotoCapabilities* PhotoCapabilities::create()
|
| -{
|
| - return new PhotoCapabilities();
|
| -}
|
| +namespace {
|
|
|
| -String PhotoCapabilities::focusMode() const
|
| +String meteringModeToString(media::mojom::blink::MeteringMode mode)
|
| {
|
| - switch (m_focusMode) {
|
| - case media::mojom::blink::FocusMode::UNAVAILABLE:
|
| + switch (mode) {
|
| + case media::mojom::blink::MeteringMode::UNAVAILABLE:
|
| return "unavailable";
|
| - case media::mojom::blink::FocusMode::MANUAL:
|
| + case media::mojom::blink::MeteringMode::MANUAL:
|
| return "manual";
|
| - case media::mojom::blink::FocusMode::SINGLE_SHOT:
|
| + case media::mojom::blink::MeteringMode::SINGLE_SHOT:
|
| return "single-shot";
|
| - case media::mojom::blink::FocusMode::CONTINUOUS:
|
| + case media::mojom::blink::MeteringMode::CONTINUOUS:
|
| return "continuous";
|
| default:
|
| NOTREACHED();
|
| @@ -29,6 +25,24 @@ String PhotoCapabilities::focusMode() const
|
| return emptyString();
|
| }
|
|
|
| +} // anonymous namespace
|
| +
|
| +// static
|
| +PhotoCapabilities* PhotoCapabilities::create()
|
| +{
|
| + return new PhotoCapabilities();
|
| +}
|
| +
|
| +String PhotoCapabilities::focusMode() const
|
| +{
|
| + return meteringModeToString(m_focusMode);
|
| +}
|
| +
|
| +String PhotoCapabilities::exposureMode() const
|
| +{
|
| + return meteringModeToString(m_exposureMode);
|
| +}
|
| +
|
| DEFINE_TRACE(PhotoCapabilities)
|
| {
|
| visitor->trace(m_iso);
|
|
|