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

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

Issue 2795293002: Image Capture: remove unnecessary .get() (followup) (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 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 m_currentPointsOfInterest.push_back(mojo::Clone(webPoint)); 510 m_currentPointsOfInterest.push_back(mojo::Clone(webPoint));
511 } 511 }
512 } 512 }
513 513
514 // TODO(mcasas): Remove the explicit MediaSettingsRange::create() when 514 // TODO(mcasas): Remove the explicit MediaSettingsRange::create() when
515 // mojo::StructTraits supports garbage-collected mappings, 515 // mojo::StructTraits supports garbage-collected mappings,
516 // https://crbug.com/700180. 516 // https://crbug.com/700180.
517 if (capabilities.exposure_compensation->max != 517 if (capabilities.exposure_compensation->max !=
518 capabilities.exposure_compensation->min) { 518 capabilities.exposure_compensation->min) {
519 m_capabilities.setExposureCompensation( 519 m_capabilities.setExposureCompensation(
520 MediaSettingsRange::create(*capabilities.exposure_compensation.get())); 520 MediaSettingsRange::create(*capabilities.exposure_compensation));
521 } 521 }
522 if (capabilities.color_temperature->max != 522 if (capabilities.color_temperature->max !=
523 capabilities.color_temperature->min) { 523 capabilities.color_temperature->min) {
524 m_capabilities.setColorTemperature( 524 m_capabilities.setColorTemperature(
525 MediaSettingsRange::create(*capabilities.color_temperature.get())); 525 MediaSettingsRange::create(*capabilities.color_temperature));
526 } 526 }
527 if (capabilities.iso->max != capabilities.iso->min) 527 if (capabilities.iso->max != capabilities.iso->min)
528 m_capabilities.setIso(MediaSettingsRange::create(*capabilities.iso.get())); 528 m_capabilities.setIso(MediaSettingsRange::create(*capabilities.iso));
529 529
530 if (capabilities.brightness->max != capabilities.brightness->min) { 530 if (capabilities.brightness->max != capabilities.brightness->min) {
531 m_capabilities.setBrightness( 531 m_capabilities.setBrightness(
532 MediaSettingsRange::create(*capabilities.brightness.get())); 532 MediaSettingsRange::create(*capabilities.brightness));
533 } 533 }
534 if (capabilities.contrast->max != capabilities.contrast->min) { 534 if (capabilities.contrast->max != capabilities.contrast->min) {
535 m_capabilities.setContrast( 535 m_capabilities.setContrast(
536 MediaSettingsRange::create(*capabilities.contrast.get())); 536 MediaSettingsRange::create(*capabilities.contrast));
537 } 537 }
538 if (capabilities.saturation->max != capabilities.saturation->min) { 538 if (capabilities.saturation->max != capabilities.saturation->min) {
539 m_capabilities.setSaturation( 539 m_capabilities.setSaturation(
540 MediaSettingsRange::create(*capabilities.saturation.get())); 540 MediaSettingsRange::create(*capabilities.saturation));
541 } 541 }
542 if (capabilities.sharpness->max != capabilities.sharpness->min) { 542 if (capabilities.sharpness->max != capabilities.sharpness->min) {
543 m_capabilities.setSharpness( 543 m_capabilities.setSharpness(
544 MediaSettingsRange::create(*capabilities.sharpness.get())); 544 MediaSettingsRange::create(*capabilities.sharpness));
545 } 545 }
546 546
547 if (capabilities.zoom->max != capabilities.zoom->min) { 547 if (capabilities.zoom->max != capabilities.zoom->min)
548 m_capabilities.setZoom( 548 m_capabilities.setZoom(MediaSettingsRange::create(*capabilities.zoom));
549 MediaSettingsRange::create(*capabilities.zoom.get()));
550 }
551 549
552 m_capabilities.setTorch(capabilities.torch); 550 m_capabilities.setTorch(capabilities.torch);
553 551
554 // TODO(mcasas): do |torch| when the mojom interface is updated, 552 // TODO(mcasas): do |torch| when the mojom interface is updated,
555 // https://crbug.com/700607. 553 // https://crbug.com/700607.
556 } 554 }
557 555
558 void ImageCapture::onServiceConnectionError() { 556 void ImageCapture::onServiceConnectionError() {
559 m_service.reset(); 557 m_service.reset();
560 for (ScriptPromiseResolver* resolver : m_serviceRequests) 558 for (ScriptPromiseResolver* resolver : m_serviceRequests)
561 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); 559 resolver->reject(DOMException::create(NotFoundError, kNoServiceError));
562 m_serviceRequests.clear(); 560 m_serviceRequests.clear();
563 } 561 }
564 562
565 DEFINE_TRACE(ImageCapture) { 563 DEFINE_TRACE(ImageCapture) {
566 visitor->trace(m_streamTrack); 564 visitor->trace(m_streamTrack);
567 visitor->trace(m_capabilities); 565 visitor->trace(m_capabilities);
568 visitor->trace(m_currentConstraints); 566 visitor->trace(m_currentConstraints);
569 visitor->trace(m_currentPointsOfInterest); 567 visitor->trace(m_currentPointsOfInterest);
570 visitor->trace(m_serviceRequests); 568 visitor->trace(m_serviceRequests);
571 EventTargetWithInlineData::trace(visitor); 569 EventTargetWithInlineData::trace(visitor);
572 ContextLifecycleObserver::trace(visitor); 570 ContextLifecycleObserver::trace(visitor);
573 } 571 }
574 572
575 } // namespace blink 573 } // 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