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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 219273002: Use OwnPtr|PassOwnPtr to pass a pointer of SpeechInputClient (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « Source/web/WebViewImpl.h ('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 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 , m_tabsToLinks(false) 351 , m_tabsToLinks(false)
352 , m_layerTreeView(0) 352 , m_layerTreeView(0)
353 , m_rootLayer(0) 353 , m_rootLayer(0)
354 , m_rootGraphicsLayer(0) 354 , m_rootGraphicsLayer(0)
355 , m_rootTransformLayer(0) 355 , m_rootTransformLayer(0)
356 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) 356 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
357 , m_isAcceleratedCompositingActive(false) 357 , m_isAcceleratedCompositingActive(false)
358 , m_layerTreeViewCommitsDeferred(false) 358 , m_layerTreeViewCommitsDeferred(false)
359 , m_compositorCreationFailed(false) 359 , m_compositorCreationFailed(false)
360 , m_recreatingGraphicsContext(false) 360 , m_recreatingGraphicsContext(false)
361 #if ENABLE(INPUT_SPEECH)
362 , m_speechInputClient(SpeechInputClientImpl::create(client))
363 #endif
364 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) 361 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0))
365 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0))) 362 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0)))
366 , m_userMediaClientImpl(this) 363 , m_userMediaClientImpl(this)
367 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0))) 364 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0)))
368 , m_flingModifier(0) 365 , m_flingModifier(0)
369 , m_flingSourceDevice(false) 366 , m_flingSourceDevice(false)
370 , m_fullscreenController(FullscreenController::create(this)) 367 , m_fullscreenController(FullscreenController::create(this))
371 , m_showFPSCounter(false) 368 , m_showFPSCounter(false)
372 , m_showPaintRects(false) 369 , m_showPaintRects(false)
373 , m_showDebugBorders(false) 370 , m_showDebugBorders(false)
(...skipping 11 matching lines...) Expand all
385 pageClients.inspectorClient = &m_inspectorClientImpl; 382 pageClients.inspectorClient = &m_inspectorClientImpl;
386 pageClients.backForwardClient = &m_backForwardClientImpl; 383 pageClients.backForwardClient = &m_backForwardClientImpl;
387 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; 384 pageClients.spellCheckerClient = &m_spellCheckerClientImpl;
388 pageClients.storageClient = &m_storageClientImpl; 385 pageClients.storageClient = &m_storageClientImpl;
389 386
390 m_page = adoptPtr(new Page(pageClients)); 387 m_page = adoptPtr(new Page(pageClients));
391 provideUserMediaTo(*m_page, &m_userMediaClientImpl); 388 provideUserMediaTo(*m_page, &m_userMediaClientImpl);
392 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 389 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
393 provideMIDITo(*m_page, m_midiClientProxy.get()); 390 provideMIDITo(*m_page, m_midiClientProxy.get());
394 #if ENABLE(INPUT_SPEECH) 391 #if ENABLE(INPUT_SPEECH)
395 provideSpeechInputTo(*m_page, m_speechInputClient.get()); 392 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client));
396 #endif 393 #endif
397 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); 394 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get());
398 provideNotification(*m_page, notificationPresenterImpl()); 395 provideNotification(*m_page, notificationPresenterImpl());
399 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this)); 396 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this));
400 397
401 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); 398 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get());
402 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) 399 if (RuntimeEnabledFeatures::deviceOrientationEnabled())
403 DeviceOrientationInspectorAgent::provideTo(*m_page); 400 DeviceOrientationInspectorAgent::provideTo(*m_page);
404 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); 401 provideGeolocationTo(*m_page, m_geolocationClientProxy.get());
405 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); 402 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et()));
(...skipping 3573 matching lines...) Expand 10 before | Expand all | Expand 10 after
3979 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3976 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3980 3977
3981 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3978 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3982 return false; 3979 return false;
3983 3980
3984 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3981 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3985 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3982 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3986 } 3983 }
3987 3984
3988 } // namespace blink 3985 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698