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

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

Issue 2696183002: Migrate WTF::HashSet::remove() to ::erase() [part 1] (Closed)
Patch Set: one more platform-specific reference Created 3 years, 10 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
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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 caps->setWhiteBalanceMode(capabilities->white_balance_mode); 334 caps->setWhiteBalanceMode(capabilities->white_balance_mode);
335 caps->setFillLightMode(capabilities->fill_light_mode); 335 caps->setFillLightMode(capabilities->fill_light_mode);
336 caps->setRedEyeReduction(capabilities->red_eye_reduction); 336 caps->setRedEyeReduction(capabilities->red_eye_reduction);
337 caps->setColorTemperature(colorTemperature); 337 caps->setColorTemperature(colorTemperature);
338 caps->setBrightness(brightness); 338 caps->setBrightness(brightness);
339 caps->setContrast(contrast); 339 caps->setContrast(contrast);
340 caps->setSaturation(saturation); 340 caps->setSaturation(saturation);
341 caps->setSharpness(sharpness); 341 caps->setSharpness(sharpness);
342 resolver->resolve(caps); 342 resolver->resolve(caps);
343 } 343 }
344 m_serviceRequests.remove(resolver); 344 m_serviceRequests.erase(resolver);
345 } 345 }
346 346
347 void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result) { 347 void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result) {
348 if (!m_serviceRequests.contains(resolver)) 348 if (!m_serviceRequests.contains(resolver))
349 return; 349 return;
350 350
351 if (result) 351 if (result)
352 resolver->resolve(); 352 resolver->resolve();
353 else 353 else
354 resolver->reject(DOMException::create(UnknownError, "setOptions failed")); 354 resolver->reject(DOMException::create(UnknownError, "setOptions failed"));
355 m_serviceRequests.remove(resolver); 355 m_serviceRequests.erase(resolver);
356 } 356 }
357 357
358 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver, 358 void ImageCapture::onTakePhoto(ScriptPromiseResolver* resolver,
359 media::mojom::blink::BlobPtr blob) { 359 media::mojom::blink::BlobPtr blob) {
360 if (!m_serviceRequests.contains(resolver)) 360 if (!m_serviceRequests.contains(resolver))
361 return; 361 return;
362 362
363 // TODO(mcasas): Should be using a mojo::StructTraits. 363 // TODO(mcasas): Should be using a mojo::StructTraits.
364 if (blob->data.isEmpty()) 364 if (blob->data.isEmpty())
365 resolver->reject(DOMException::create(UnknownError, "platform error")); 365 resolver->reject(DOMException::create(UnknownError, "platform error"));
366 else 366 else
367 resolver->resolve( 367 resolver->resolve(
368 Blob::create(blob->data.data(), blob->data.size(), blob->mime_type)); 368 Blob::create(blob->data.data(), blob->data.size(), blob->mime_type));
369 m_serviceRequests.remove(resolver); 369 m_serviceRequests.erase(resolver);
370 } 370 }
371 371
372 void ImageCapture::onServiceConnectionError() { 372 void ImageCapture::onServiceConnectionError() {
373 m_service.reset(); 373 m_service.reset();
374 for (ScriptPromiseResolver* resolver : m_serviceRequests) 374 for (ScriptPromiseResolver* resolver : m_serviceRequests)
375 resolver->reject(DOMException::create(NotFoundError, kNoServiceError)); 375 resolver->reject(DOMException::create(NotFoundError, kNoServiceError));
376 m_serviceRequests.clear(); 376 m_serviceRequests.clear();
377 } 377 }
378 378
379 DEFINE_TRACE(ImageCapture) { 379 DEFINE_TRACE(ImageCapture) {
380 visitor->trace(m_streamTrack); 380 visitor->trace(m_streamTrack);
381 visitor->trace(m_serviceRequests); 381 visitor->trace(m_serviceRequests);
382 EventTargetWithInlineData::trace(visitor); 382 EventTargetWithInlineData::trace(visitor);
383 ContextLifecycleObserver::trace(visitor); 383 ContextLifecycleObserver::trace(visitor);
384 } 384 }
385 385
386 } // namespace blink 386 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/geolocation/Geolocation.cpp ('k') | third_party/WebKit/Source/modules/nfc/NFC.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698