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

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

Issue 2827693003: ImageCapture: don't list |torch| in Capabilities if not supported (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 | « no previous file | 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 capabilities_.setSharpness( 629 capabilities_.setSharpness(
630 MediaSettingsRange::Create(*capabilities.sharpness)); 630 MediaSettingsRange::Create(*capabilities.sharpness));
631 settings_.setSharpness(capabilities.sharpness->current); 631 settings_.setSharpness(capabilities.sharpness->current);
632 } 632 }
633 633
634 if (capabilities.zoom->max != capabilities.zoom->min) { 634 if (capabilities.zoom->max != capabilities.zoom->min) {
635 capabilities_.setZoom(MediaSettingsRange::Create(*capabilities.zoom)); 635 capabilities_.setZoom(MediaSettingsRange::Create(*capabilities.zoom));
636 settings_.setZoom(capabilities.zoom->current); 636 settings_.setZoom(capabilities.zoom->current);
637 } 637 }
638 638
639 capabilities_.setTorch(capabilities.supports_torch); 639 if (capabilities.supports_torch)
640 capabilities_.setTorch(capabilities.supports_torch);
640 if (capabilities.supports_torch) 641 if (capabilities.supports_torch)
641 settings_.setTorch(capabilities.torch); 642 settings_.setTorch(capabilities.torch);
642 } 643 }
643 644
644 void ImageCapture::OnServiceConnectionError() { 645 void ImageCapture::OnServiceConnectionError() {
645 service_.reset(); 646 service_.reset();
646 for (ScriptPromiseResolver* resolver : service_requests_) 647 for (ScriptPromiseResolver* resolver : service_requests_)
647 resolver->Reject(DOMException::Create(kNotFoundError, kNoServiceError)); 648 resolver->Reject(DOMException::Create(kNotFoundError, kNoServiceError));
648 service_requests_.Clear(); 649 service_requests_.Clear();
649 } 650 }
650 651
651 DEFINE_TRACE(ImageCapture) { 652 DEFINE_TRACE(ImageCapture) {
652 visitor->Trace(stream_track_); 653 visitor->Trace(stream_track_);
653 visitor->Trace(capabilities_); 654 visitor->Trace(capabilities_);
654 visitor->Trace(settings_); 655 visitor->Trace(settings_);
655 visitor->Trace(current_constraints_); 656 visitor->Trace(current_constraints_);
656 visitor->Trace(service_requests_); 657 visitor->Trace(service_requests_);
657 EventTargetWithInlineData::Trace(visitor); 658 EventTargetWithInlineData::Trace(visitor);
658 ContextLifecycleObserver::Trace(visitor); 659 ContextLifecycleObserver::Trace(visitor);
659 } 660 }
660 661
661 } // namespace blink 662 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698