| 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 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 461 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 461 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| 462 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : nullptr)); | 462 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : nullptr)); |
| 463 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); | 463 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); |
| 464 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 464 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
| 465 | 465 |
| 466 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 466 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
| 467 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); | 467 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); |
| 468 provideDedicatedWorkerGlobalScopeProxyProviderTo(*m_page, DedicatedWorkerGlo
balScopeProxyProviderImpl::create()); | 468 provideDedicatedWorkerGlobalScopeProxyProviderTo(*m_page, DedicatedWorkerGlo
balScopeProxyProviderImpl::create()); |
| 469 StorageNamespaceController::provideStorageNamespaceTo(*m_page, &m_storageCli
entImpl); | 469 StorageNamespaceController::provideStorageNamespaceTo(*m_page, &m_storageCli
entImpl); |
| 470 | 470 |
| 471 if (m_client) { | 471 if (m_client) |
| 472 setVisibilityState(m_client->visibilityState(), true); | 472 setVisibilityState(m_client->visibilityState(), true); |
| 473 } | |
| 474 | 473 |
| 475 initializeLayerTreeView(); | 474 initializeLayerTreeView(); |
| 476 | 475 |
| 477 m_devToolsEmulator = DevToolsEmulator::create(this); | 476 m_devToolsEmulator = DevToolsEmulator::create(this); |
| 478 | 477 |
| 479 allInstances().add(this); | 478 allInstances().add(this); |
| 480 | 479 |
| 481 m_pageImportanceSignals.setObserver(client); | 480 m_pageImportanceSignals.setObserver(client); |
| 482 } | 481 } |
| 483 | 482 |
| (...skipping 4069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4553 { | 4552 { |
| 4554 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4553 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4555 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4554 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4556 if (!page()) | 4555 if (!page()) |
| 4557 return 1; | 4556 return 1; |
| 4558 | 4557 |
| 4559 return page()->deviceScaleFactor(); | 4558 return page()->deviceScaleFactor(); |
| 4560 } | 4559 } |
| 4561 | 4560 |
| 4562 } // namespace blink | 4561 } // namespace blink |
| OLD | NEW |