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

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

Issue 2161193003: Use __func__ instead of __FUNCTION__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync Created 4 years, 4 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 DCHECK(!m_service.is_bound()); 189 DCHECK(!m_service.is_bound());
190 190
191 Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProx y(&m_service)); 191 Platform::current()->serviceRegistry()->connectToRemoteService(mojo::GetProx y(&m_service));
192 192
193 m_service.set_connection_error_handler(convertToBaseCallback(WTF::bind(&Imag eCapture::onServiceConnectionError, wrapWeakPersistent(this)))); 193 m_service.set_connection_error_handler(convertToBaseCallback(WTF::bind(&Imag eCapture::onServiceConnectionError, wrapWeakPersistent(this))));
194 194
195 } 195 }
196 196
197 void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom: :blink::PhotoCapabilitiesPtr capabilities) 197 void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom: :blink::PhotoCapabilitiesPtr capabilities)
198 { 198 {
199 DVLOG(1) << __FUNCTION__; 199 DVLOG(1) << __func__;
200 if (!m_serviceRequests.contains(resolver)) 200 if (!m_serviceRequests.contains(resolver))
201 return; 201 return;
202 if (capabilities.is_null()) { 202 if (capabilities.is_null()) {
203 resolver->reject(DOMException::create(UnknownError, "platform error")); 203 resolver->reject(DOMException::create(UnknownError, "platform error"));
204 } else { 204 } else {
205 // TODO(mcasas): Should be using a mojo::StructTraits. 205 // TODO(mcasas): Should be using a mojo::StructTraits.
206 MediaSettingsRange* iso = MediaSettingsRange::create(capabilities->iso-> max, capabilities->iso->min, capabilities->iso->current); 206 MediaSettingsRange* iso = MediaSettingsRange::create(capabilities->iso-> max, capabilities->iso->min, capabilities->iso->current);
207 MediaSettingsRange* height = MediaSettingsRange::create(capabilities->he ight->max, capabilities->height->min, capabilities->height->current); 207 MediaSettingsRange* height = MediaSettingsRange::create(capabilities->he ight->max, capabilities->height->min, capabilities->height->current);
208 MediaSettingsRange* width = MediaSettingsRange::create(capabilities->wid th->max, capabilities->width->min, capabilities->width->current); 208 MediaSettingsRange* width = MediaSettingsRange::create(capabilities->wid th->max, capabilities->width->min, capabilities->width->current);
209 MediaSettingsRange* zoom = MediaSettingsRange::create(capabilities->zoom ->max, capabilities->zoom->min, capabilities->zoom->current); 209 MediaSettingsRange* zoom = MediaSettingsRange::create(capabilities->zoom ->max, capabilities->zoom->min, capabilities->zoom->current);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 DEFINE_TRACE(ImageCapture) 254 DEFINE_TRACE(ImageCapture)
255 { 255 {
256 visitor->trace(m_streamTrack); 256 visitor->trace(m_streamTrack);
257 visitor->trace(m_serviceRequests); 257 visitor->trace(m_serviceRequests);
258 EventTargetWithInlineData::trace(visitor); 258 EventTargetWithInlineData::trace(visitor);
259 ContextLifecycleObserver::trace(visitor); 259 ContextLifecycleObserver::trace(visitor);
260 } 260 }
261 261
262 } // namespace blink 262 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698