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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 171333003: Pass implementation object to supplemental classes by reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 73c253d5748aa4a4e7439e04d7cd83ef9c4ed69e..310de40863a067160c4dee7c8f6d69a709fef25e 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -299,7 +299,8 @@ void WebViewImpl::setDevToolsAgentClient(WebDevToolsAgentClient* devToolsClient)
void WebViewImpl::setPrerendererClient(WebPrerendererClient* prerendererClient)
{
- providePrerendererClientTo(m_page.get(), new PrerendererClientImpl(prerendererClient));
+ ASSERT(m_page);
+ providePrerendererClientTo(*m_page, new PrerendererClientImpl(prerendererClient));
}
void WebViewImpl::setSpellCheckClient(WebSpellCheckClient* spellCheckClient)
@@ -388,28 +389,28 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
pageClients.storageClient = &m_storageClientImpl;
m_page = adoptPtr(new Page(pageClients));
- provideUserMediaTo(m_page.get(), &m_userMediaClientImpl);
- provideMIDITo(m_page.get(), m_midiClientProxy.get());
+ provideUserMediaTo(*m_page, &m_userMediaClientImpl);
+ provideMIDITo(*m_page, m_midiClientProxy.get());
#if ENABLE(INPUT_SPEECH)
- provideSpeechInputTo(m_page.get(), m_speechInputClient.get());
+ provideSpeechInputTo(*m_page, m_speechInputClient.get());
#endif
- provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get());
- provideNotification(m_page.get(), notificationPresenterImpl());
- provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.get());
+ provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get());
+ provideNotification(*m_page, notificationPresenterImpl());
+ provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get());
- provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get());
+ provideContextFeaturesTo(*m_page, m_featureSwitchClient.get());
if (RuntimeEnabledFeatures::deviceOrientationEnabled())
- DeviceOrientationInspectorAgent::provideTo(m_page.get());
- provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get());
+ DeviceOrientationInspectorAgent::provideTo(*m_page);
+ provideGeolocationTo(*m_page, m_geolocationClientProxy.get());
m_geolocationClientProxy->setController(GeolocationController::from(m_page.get()));
- provideLocalFileSystemTo(m_page.get(), LocalFileSystemClient::create());
- provideDatabaseClientTo(m_page.get(), DatabaseClientImpl::create());
+ provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create());
+ provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
InspectorIndexedDBAgent::provideTo(m_page.get());
- provideStorageQuotaClientTo(m_page.get(), StorageQuotaClientImpl::create());
+ provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create());
m_validationMessage = ValidationMessageClientImpl::create(*this);
m_page->setValidationMessageClient(m_validationMessage.get());
- provideWorkerGlobalScopeProxyProviderTo(m_page.get(), WorkerGlobalScopeProxyProviderImpl::create());
+ provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProviderImpl::create());
m_page->setGroupType(Page::SharedPageGroup);
@@ -1407,7 +1408,8 @@ void WebViewImpl::popupOpened(PopupContainer* popupContainer)
{
ASSERT(!m_selectPopup);
m_selectPopup = popupContainer;
- Document* document = mainFrameImpl()->frame()->document();
+ ASSERT(mainFrameImpl()->frame()->document());
+ Document& document = *mainFrameImpl()->frame()->document();
WheelController::from(document)->didAddWheelEventHandler(document);
}
@@ -1415,7 +1417,8 @@ void WebViewImpl::popupClosed(PopupContainer* popupContainer)
{
ASSERT(m_selectPopup);
m_selectPopup = 0;
- Document* document = mainFrameImpl()->frame()->document();
+ ASSERT(mainFrameImpl()->frame()->document());
+ Document& document = *mainFrameImpl()->frame()->document();
WheelController::from(document)->didRemoveWheelEventHandler(document);
}

Powered by Google App Engine
This is Rietveld 408576698