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

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

Issue 224113006: Apply OwnPtr|PassOwnPtr to member variables and arguments in ContextFeatures. (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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 , m_fakePageScaleAnimationUseAnchor(false) 340 , m_fakePageScaleAnimationUseAnchor(false)
341 , m_contextMenuAllowed(false) 341 , m_contextMenuAllowed(false)
342 , m_doingDragAndDrop(false) 342 , m_doingDragAndDrop(false)
343 , m_ignoreInputEvents(false) 343 , m_ignoreInputEvents(false)
344 , m_compositorDeviceScaleFactorOverride(0) 344 , m_compositorDeviceScaleFactorOverride(0)
345 , m_rootLayerScale(1) 345 , m_rootLayerScale(1)
346 , m_suppressNextKeypressEvent(false) 346 , m_suppressNextKeypressEvent(false)
347 , m_imeAcceptEvents(true) 347 , m_imeAcceptEvents(true)
348 , m_operationsAllowed(WebDragOperationNone) 348 , m_operationsAllowed(WebDragOperationNone)
349 , m_dragOperation(WebDragOperationNone) 349 , m_dragOperation(WebDragOperationNone)
350 , m_featureSwitchClient(adoptPtr(new ContextFeaturesClientImpl()))
351 , m_isTransparent(false) 350 , m_isTransparent(false)
352 , m_tabsToLinks(false) 351 , m_tabsToLinks(false)
353 , m_layerTreeView(0) 352 , m_layerTreeView(0)
354 , m_rootLayer(0) 353 , m_rootLayer(0)
355 , m_rootGraphicsLayer(0) 354 , m_rootGraphicsLayer(0)
356 , m_rootTransformLayer(0) 355 , m_rootTransformLayer(0)
357 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this))) 356 , m_graphicsLayerFactory(adoptPtr(new GraphicsLayerFactoryChromium(this)))
358 , m_isAcceleratedCompositingActive(false) 357 , m_isAcceleratedCompositingActive(false)
359 , m_layerTreeViewCommitsDeferred(false) 358 , m_layerTreeViewCommitsDeferred(false)
360 , m_compositorCreationFailed(false) 359 , m_compositorCreationFailed(false)
(...skipping 26 matching lines...) Expand all
387 provideUserMediaTo(*m_page, &m_userMediaClientImpl); 386 provideUserMediaTo(*m_page, &m_userMediaClientImpl);
388 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 387 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
389 provideMIDITo(*m_page, MIDIClientProxy::create(client ? client->webMIDIClien t() : 0)); 388 provideMIDITo(*m_page, MIDIClientProxy::create(client ? client->webMIDIClien t() : 0));
390 #if ENABLE(INPUT_SPEECH) 389 #if ENABLE(INPUT_SPEECH)
391 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client)); 390 provideSpeechInputTo(*m_page, SpeechInputClientImpl::create(client));
392 #endif 391 #endif
393 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0)); 392 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0));
394 provideNotification(*m_page, notificationPresenterImpl()); 393 provideNotification(*m_page, notificationPresenterImpl());
395 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this)); 394 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this));
396 395
397 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); 396 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create().get()) ;
jochen (gone - plz use gerrit) 2014/04/04 09:07:01 won't this delete the client immediately?
gyuyoung-inactive 2014/04/04 09:51:11 Yes, right. This patch won't delete the client ins
398 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) 397 if (RuntimeEnabledFeatures::deviceOrientationEnabled())
399 DeviceOrientationInspectorAgent::provideTo(*m_page); 398 DeviceOrientationInspectorAgent::provideTo(*m_page);
400 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); 399 provideGeolocationTo(*m_page, m_geolocationClientProxy.get());
401 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); 400 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et()));
402 401
403 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); 402 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create());
404 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); 403 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
405 InspectorIndexedDBAgent::provideTo(m_page.get()); 404 InspectorIndexedDBAgent::provideTo(m_page.get());
406 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); 405 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create());
407 m_validationMessage = ValidationMessageClientImpl::create(*this); 406 m_validationMessage = ValidationMessageClientImpl::create(*this);
(...skipping 3567 matching lines...) Expand 10 before | Expand all | Expand 10 after
3975 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3974 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3976 3975
3977 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3976 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3978 return false; 3977 return false;
3979 3978
3980 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3979 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3981 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3980 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3982 } 3981 }
3983 3982
3984 } // namespace blink 3983 } // 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