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

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

Issue 218393003: Use OwnPtr|PassOwnPtr to pass a pointer of NavigatorContentUtilsClient instance (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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 , m_layerTreeViewCommitsDeferred(false) 357 , m_layerTreeViewCommitsDeferred(false)
358 , m_compositorCreationFailed(false) 358 , m_compositorCreationFailed(false)
359 , m_recreatingGraphicsContext(false) 359 , m_recreatingGraphicsContext(false)
360 #if ENABLE(INPUT_SPEECH) 360 #if ENABLE(INPUT_SPEECH)
361 , m_speechInputClient(SpeechInputClientImpl::create(client)) 361 , m_speechInputClient(SpeechInputClientImpl::create(client))
362 #endif 362 #endif
363 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) 363 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0))
364 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0))) 364 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0)))
365 , m_userMediaClientImpl(this) 365 , m_userMediaClientImpl(this)
366 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0))) 366 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0)))
367 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this ))
368 , m_flingModifier(0) 367 , m_flingModifier(0)
369 , m_flingSourceDevice(false) 368 , m_flingSourceDevice(false)
370 , m_fullscreenController(FullscreenController::create(this)) 369 , m_fullscreenController(FullscreenController::create(this))
371 , m_showFPSCounter(false) 370 , m_showFPSCounter(false)
372 , m_showPaintRects(false) 371 , m_showPaintRects(false)
373 , m_showDebugBorders(false) 372 , m_showDebugBorders(false)
374 , m_continuousPaintingEnabled(false) 373 , m_continuousPaintingEnabled(false)
375 , m_showScrollBottleneckRects(false) 374 , m_showScrollBottleneckRects(false)
376 , m_baseBackgroundColor(Color::white) 375 , m_baseBackgroundColor(Color::white)
377 , m_backgroundColorOverride(Color::transparent) 376 , m_backgroundColorOverride(Color::transparent)
(...skipping 11 matching lines...) Expand all
389 388
390 m_page = adoptPtr(new Page(pageClients)); 389 m_page = adoptPtr(new Page(pageClients));
391 provideUserMediaTo(*m_page, &m_userMediaClientImpl); 390 provideUserMediaTo(*m_page, &m_userMediaClientImpl);
392 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 391 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
393 provideMIDITo(*m_page, m_midiClientProxy.get()); 392 provideMIDITo(*m_page, m_midiClientProxy.get());
394 #if ENABLE(INPUT_SPEECH) 393 #if ENABLE(INPUT_SPEECH)
395 provideSpeechInputTo(*m_page, m_speechInputClient.get()); 394 provideSpeechInputTo(*m_page, m_speechInputClient.get());
396 #endif 395 #endif
397 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); 396 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get());
398 provideNotification(*m_page, notificationPresenterImpl()); 397 provideNotification(*m_page, notificationPresenterImpl());
399 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get()) ; 398 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this));
400 399
401 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); 400 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get());
402 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) 401 if (RuntimeEnabledFeatures::deviceOrientationEnabled())
403 DeviceOrientationInspectorAgent::provideTo(*m_page); 402 DeviceOrientationInspectorAgent::provideTo(*m_page);
404 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); 403 provideGeolocationTo(*m_page, m_geolocationClientProxy.get());
405 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); 404 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et()));
406 405
407 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); 406 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create());
408 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); 407 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
409 InspectorIndexedDBAgent::provideTo(m_page.get()); 408 InspectorIndexedDBAgent::provideTo(m_page.get());
(...skipping 3580 matching lines...) Expand 10 before | Expand all | Expand 10 after
3990 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 3989 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
3991 3990
3992 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 3991 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
3993 return false; 3992 return false;
3994 3993
3995 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 3994 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
3996 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 3995 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
3997 } 3996 }
3998 3997
3999 } // namespace blink 3998 } // 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