| 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 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); | 397 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); |
| 398 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) | 398 if (RuntimeEnabledFeatures::deviceOrientationEnabled()) |
| 399 DeviceOrientationInspectorAgent::provideTo(*m_page); | 399 DeviceOrientationInspectorAgent::provideTo(*m_page); |
| 400 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); | 400 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); |
| 401 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); | 401 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); |
| 402 | 402 |
| 403 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); | 403 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); |
| 404 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 404 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
| 405 InspectorIndexedDBAgent::provideTo(m_page.get()); | 405 InspectorIndexedDBAgent::provideTo(m_page.get()); |
| 406 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 406 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
| 407 m_validationMessage = ValidationMessageClientImpl::create(*this); | 407 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); |
| 408 m_page->setValidationMessageClient(m_validationMessage.get()); | |
| 409 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); | 408 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); |
| 410 | 409 |
| 411 m_page->makeOrdinary(); | 410 m_page->makeOrdinary(); |
| 412 | 411 |
| 413 if (m_client) { | 412 if (m_client) { |
| 414 providePushControllerTo(*m_page, m_client->webPushClient()); | 413 providePushControllerTo(*m_page, m_client->webPushClient()); |
| 415 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 414 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 416 setVisibilityState(m_client->visibilityState(), true); | 415 setVisibilityState(m_client->visibilityState(), true); |
| 417 } | 416 } |
| 418 | 417 |
| (...skipping 3561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3980 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 3979 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 3981 | 3980 |
| 3982 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3981 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3983 return false; | 3982 return false; |
| 3984 | 3983 |
| 3985 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3984 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3986 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 3985 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 3987 } | 3986 } |
| 3988 | 3987 |
| 3989 } // namespace blink | 3988 } // namespace blink |
| OLD | NEW |