| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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()); |
| 411 | 412 |
| 412 m_page->makeOrdinary(); | 413 m_page->makeOrdinary(); |
| 413 | 414 |
| 414 if (m_client) { | 415 if (m_client) { |
| 416 providePushControllerTo(*m_page, m_client->webPushClient()); |
| 415 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 417 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 416 setVisibilityState(m_client->visibilityState(), true); | 418 setVisibilityState(m_client->visibilityState(), true); |
| 417 } | 419 } |
| 418 | 420 |
| 419 m_inspectorSettingsMap = adoptPtr(new SettingsMap); | 421 m_inspectorSettingsMap = adoptPtr(new SettingsMap); |
| 420 } | 422 } |
| 421 | 423 |
| 422 WebViewImpl::~WebViewImpl() | 424 WebViewImpl::~WebViewImpl() |
| 423 { | 425 { |
| 424 ASSERT(!m_page); | 426 ASSERT(!m_page); |
| (...skipping 3543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3968 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 3970 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 3969 | 3971 |
| 3970 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 3972 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 3971 return false; | 3973 return false; |
| 3972 | 3974 |
| 3973 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 3975 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 3974 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 3976 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 3975 } | 3977 } |
| 3976 | 3978 |
| 3977 } // namespace blink | 3979 } // namespace blink |
| OLD | NEW |