Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2798263003: Image Capture: add |supports_torch| field to mojom (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/imagecapture/ImageCapture.h" 5 #include "modules/imagecapture/ImageCapture.h"
6 6
7 #include "bindings/core/v8/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/ExceptionCode.h" 10 #include "core/dom/ExceptionCode.h"
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 m_capabilities.setSharpness( 557 m_capabilities.setSharpness(
558 MediaSettingsRange::create(*capabilities.sharpness)); 558 MediaSettingsRange::create(*capabilities.sharpness));
559 m_settings.setSharpness(capabilities.sharpness->current); 559 m_settings.setSharpness(capabilities.sharpness->current);
560 } 560 }
561 561
562 if (capabilities.zoom->max != capabilities.zoom->min) { 562 if (capabilities.zoom->max != capabilities.zoom->min) {
563 m_capabilities.setZoom(MediaSettingsRange::create(*capabilities.zoom)); 563 m_capabilities.setZoom(MediaSettingsRange::create(*capabilities.zoom));
564 m_settings.setZoom(capabilities.zoom->current); 564 m_settings.setZoom(capabilities.zoom->current);
565 } 565 }
566 566
567 m_capabilities.setTorch(capabilities.torch); 567 m_capabilities.setTorch(capabilities.supports_torch);
568 568 if (capabilities.supports_torch)
569 // TODO(mcasas): do |torch| when the mojom interface is updated, 569 m_settings.setTorch(capabilities.torch);
570 // https://crbug.com/700607.
571 } 570 }
572 571
573 void ImageCapture::onServiceConnectionError() { 572 void ImageCapture::onServiceConnectionError() {
574 m_service.reset(); 573 m_service.reset();
575 for (ScriptPromiseResolver* resolver : m_serviceRequests) 574 for (ScriptPromiseResolver* resolver : m_serviceRequests)
576 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); 575 resolver->reject(DOMException::create(NotFoundError, kNoServiceError));
577 m_serviceRequests.clear(); 576 m_serviceRequests.clear();
578 } 577 }
579 578
580 DEFINE_TRACE(ImageCapture) { 579 DEFINE_TRACE(ImageCapture) {
581 visitor->trace(m_streamTrack); 580 visitor->trace(m_streamTrack);
582 visitor->trace(m_capabilities); 581 visitor->trace(m_capabilities);
583 visitor->trace(m_settings); 582 visitor->trace(m_settings);
584 visitor->trace(m_currentConstraints); 583 visitor->trace(m_currentConstraints);
585 visitor->trace(m_serviceRequests); 584 visitor->trace(m_serviceRequests);
586 EventTargetWithInlineData::trace(visitor); 585 EventTargetWithInlineData::trace(visitor);
587 ContextLifecycleObserver::trace(visitor); 586 ContextLifecycleObserver::trace(visitor);
588 } 587 }
589 588
590 } // namespace blink 589 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/imagecapture/resources/mock-imagecapture.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698