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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 113 #include "core/page/ScopedPageLoadDeferrer.h" | 113 #include "core/page/ScopedPageLoadDeferrer.h" |
| 114 #include "core/page/TouchDisambiguation.h" | 114 #include "core/page/TouchDisambiguation.h" |
| 115 #include "core/rendering/RenderView.h" | 115 #include "core/rendering/RenderView.h" |
| 116 #include "core/rendering/RenderWidget.h" | 116 #include "core/rendering/RenderWidget.h" |
| 117 #include "core/rendering/TextAutosizer.h" | 117 #include "core/rendering/TextAutosizer.h" |
| 118 #include "core/rendering/compositing/RenderLayerCompositor.h" | 118 #include "core/rendering/compositing/RenderLayerCompositor.h" |
| 119 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" | 119 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" |
| 120 #include "modules/geolocation/GeolocationController.h" | 120 #include "modules/geolocation/GeolocationController.h" |
| 121 #include "modules/indexeddb/InspectorIndexedDBAgent.h" | 121 #include "modules/indexeddb/InspectorIndexedDBAgent.h" |
| 122 #include "modules/notifications/NotificationController.h" | 122 #include "modules/notifications/NotificationController.h" |
| 123 #include "modules/pushmessaging/PushController.h" | |
| 123 #include "painting/ContinuousPainter.h" | 124 #include "painting/ContinuousPainter.h" |
| 124 #include "platform/ContextMenu.h" | 125 #include "platform/ContextMenu.h" |
| 125 #include "platform/ContextMenuItem.h" | 126 #include "platform/ContextMenuItem.h" |
| 126 #include "platform/Cursor.h" | 127 #include "platform/Cursor.h" |
| 127 #include "platform/KeyboardCodes.h" | 128 #include "platform/KeyboardCodes.h" |
| 128 #include "platform/NotImplemented.h" | 129 #include "platform/NotImplemented.h" |
| 129 #include "platform/OverscrollTheme.h" | 130 #include "platform/OverscrollTheme.h" |
| 130 #include "platform/PlatformGestureEvent.h" | 131 #include "platform/PlatformGestureEvent.h" |
| 131 #include "platform/PlatformKeyboardEvent.h" | 132 #include "platform/PlatformKeyboardEvent.h" |
| 132 #include "platform/PlatformMouseEvent.h" | 133 #include "platform/PlatformMouseEvent.h" |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 401 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); | 402 provideGeolocationTo(*m_page, m_geolocationClientProxy.get()); |
| 402 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); | 403 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g et())); |
| 403 | 404 |
| 404 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); | 405 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); |
| 405 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 406 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
| 406 InspectorIndexedDBAgent::provideTo(m_page.get()); | 407 InspectorIndexedDBAgent::provideTo(m_page.get()); |
| 407 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 408 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
| 408 m_validationMessage = ValidationMessageClientImpl::create(*this); | 409 m_validationMessage = ValidationMessageClientImpl::create(*this); |
| 409 m_page->setValidationMessageClient(m_validationMessage.get()); | 410 m_page->setValidationMessageClient(m_validationMessage.get()); |
| 410 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create()); | 411 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create()); |
| 412 if (m_client) | |
| 413 providePushControllerTo(*m_page, m_client->webPushClient()); | |
|
Peter Beverloo
2014/03/10 13:59:28
Perhaps you could check the value of the runtime f
Michael van Ouwerkerk
2014/03/10 15:12:04
Done.
| |
| 414 | |
| 411 | 415 |
| 412 m_page->makeOrdinary(); | 416 m_page->makeOrdinary(); |
| 413 | 417 |
| 414 if (m_client) { | 418 if (m_client) { |
| 415 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 419 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 416 setVisibilityState(m_client->visibilityState(), true); | 420 setVisibilityState(m_client->visibilityState(), true); |
| 417 } | 421 } |
| 418 | 422 |
| 419 m_inspectorSettingsMap = adoptPtr(new SettingsMap); | 423 m_inspectorSettingsMap = adoptPtr(new SettingsMap); |
| 420 } | 424 } |
| (...skipping 3553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3974 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); | 3978 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); |
| 3975 | 3979 |
| 3976 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3980 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3977 return false; | 3981 return false; |
| 3978 | 3982 |
| 3979 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3983 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3980 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); | 3984 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); |
| 3981 } | 3985 } |
| 3982 | 3986 |
| 3983 } // namespace blink | 3987 } // namespace blink |
| OLD | NEW |