Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 355 , m_isAcceleratedCompositingActive(false) | 355 , m_isAcceleratedCompositingActive(false) |
| 356 , m_layerTreeViewCommitsDeferred(false) | 356 , m_layerTreeViewCommitsDeferred(false) |
| 357 , m_compositorCreationFailed(false) | 357 , m_compositorCreationFailed(false) |
| 358 , m_recreatingGraphicsContext(false) | 358 , m_recreatingGraphicsContext(false) |
| 359 #if ENABLE(INPUT_SPEECH) | 359 #if ENABLE(INPUT_SPEECH) |
| 360 , m_speechInputClient(SpeechInputClientImpl::create(client)) | 360 , m_speechInputClient(SpeechInputClientImpl::create(client)) |
| 361 #endif | 361 #endif |
| 362 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) | 362 , m_speechRecognitionClient(SpeechRecognitionClientProxy::create(client ? cl ient->speechRecognizer() : 0)) |
| 363 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0))) | 363 , m_geolocationClientProxy(adoptPtr(new GeolocationClientProxy(client ? clie nt->geolocationClient() : 0))) |
| 364 , m_userMediaClientImpl(this) | 364 , m_userMediaClientImpl(this) |
| 365 , m_mediaKeysClientImpl(MediaKeysClientImpl::create()) | |
| 365 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0))) | 366 , m_midiClientProxy(adoptPtr(new MIDIClientProxy(client ? client->webMIDICli ent() : 0))) |
| 366 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this )) | 367 , m_navigatorContentUtilsClient(NavigatorContentUtilsClientImpl::create(this )) |
| 367 , m_flingModifier(0) | 368 , m_flingModifier(0) |
| 368 , m_flingSourceDevice(false) | 369 , m_flingSourceDevice(false) |
| 369 , m_fullscreenController(FullscreenController::create(this)) | 370 , m_fullscreenController(FullscreenController::create(this)) |
| 370 , m_showFPSCounter(false) | 371 , m_showFPSCounter(false) |
| 371 , m_showPaintRects(false) | 372 , m_showPaintRects(false) |
| 372 , m_showDebugBorders(false) | 373 , m_showDebugBorders(false) |
| 373 , m_continuousPaintingEnabled(false) | 374 , m_continuousPaintingEnabled(false) |
| 374 , m_showScrollBottleneckRects(false) | 375 , m_showScrollBottleneckRects(false) |
| 375 , m_baseBackgroundColor(Color::white) | 376 , m_baseBackgroundColor(Color::white) |
| 376 , m_backgroundColorOverride(Color::transparent) | 377 , m_backgroundColorOverride(Color::transparent) |
| 377 , m_zoomFactorOverride(0) | 378 , m_zoomFactorOverride(0) |
| 378 { | 379 { |
| 379 Page::PageClients pageClients; | 380 Page::PageClients pageClients; |
| 380 pageClients.chromeClient = &m_chromeClientImpl; | 381 pageClients.chromeClient = &m_chromeClientImpl; |
| 381 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 382 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
| 382 pageClients.editorClient = &m_editorClientImpl; | 383 pageClients.editorClient = &m_editorClientImpl; |
| 383 pageClients.dragClient = &m_dragClientImpl; | 384 pageClients.dragClient = &m_dragClientImpl; |
| 384 pageClients.inspectorClient = &m_inspectorClientImpl; | 385 pageClients.inspectorClient = &m_inspectorClientImpl; |
| 385 pageClients.backForwardClient = &m_backForwardClientImpl; | 386 pageClients.backForwardClient = &m_backForwardClientImpl; |
| 386 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 387 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 387 pageClients.storageClient = &m_storageClientImpl; | 388 pageClients.storageClient = &m_storageClientImpl; |
| 388 | 389 |
| 389 m_page = adoptPtr(new Page(pageClients)); | 390 m_page = adoptPtr(new Page(pageClients)); |
| 390 provideUserMediaTo(*m_page, &m_userMediaClientImpl); | 391 provideUserMediaTo(*m_page, &m_userMediaClientImpl); |
| 392 provideMediaKeysTo(*m_page, m_mediaKeysClientImpl.get()); | |
|
acolwell GONE FROM CHROMIUM
2014/03/17 23:34:45
Could you get away w/ passing MediaKeysClient& her
jrummell
2014/03/18 17:05:31
Done.
| |
| 391 provideMIDITo(*m_page, m_midiClientProxy.get()); | 393 provideMIDITo(*m_page, m_midiClientProxy.get()); |
| 392 #if ENABLE(INPUT_SPEECH) | 394 #if ENABLE(INPUT_SPEECH) |
| 393 provideSpeechInputTo(*m_page, m_speechInputClient.get()); | 395 provideSpeechInputTo(*m_page, m_speechInputClient.get()); |
| 394 #endif | 396 #endif |
| 395 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); | 397 provideSpeechRecognitionTo(*m_page, m_speechRecognitionClient.get()); |
| 396 provideNotification(*m_page, notificationPresenterImpl()); | 398 provideNotification(*m_page, notificationPresenterImpl()); |
| 397 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get()) ; | 399 provideNavigatorContentUtilsTo(*m_page, m_navigatorContentUtilsClient.get()) ; |
| 398 | 400 |
| 399 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); | 401 provideContextFeaturesTo(*m_page, m_featureSwitchClient.get()); |
| 400 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 402 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| (...skipping 3597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3998 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); | 4000 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); |
| 3999 | 4001 |
| 4000 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4002 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4001 return false; | 4003 return false; |
| 4002 | 4004 |
| 4003 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4005 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4004 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 4006 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
| 4005 } | 4007 } |
| 4006 | 4008 |
| 4007 } // namespace blink | 4009 } // namespace blink |
| OLD | NEW |