| 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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 #include "core/page/TouchDisambiguation.h" | 83 #include "core/page/TouchDisambiguation.h" |
| 84 #include "core/rendering/RenderPart.h" | 84 #include "core/rendering/RenderPart.h" |
| 85 #include "core/rendering/RenderView.h" | 85 #include "core/rendering/RenderView.h" |
| 86 #include "core/rendering/TextAutosizer.h" | 86 #include "core/rendering/TextAutosizer.h" |
| 87 #include "core/rendering/compositing/RenderLayerCompositor.h" | 87 #include "core/rendering/compositing/RenderLayerCompositor.h" |
| 88 #include "modules/credentialmanager/CredentialManagerClient.h" | 88 #include "modules/credentialmanager/CredentialManagerClient.h" |
| 89 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" | 89 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" |
| 90 #include "modules/encryptedmedia/MediaKeysController.h" | 90 #include "modules/encryptedmedia/MediaKeysController.h" |
| 91 #include "modules/filesystem/InspectorFileSystemAgent.h" | 91 #include "modules/filesystem/InspectorFileSystemAgent.h" |
| 92 #include "modules/indexeddb/InspectorIndexedDBAgent.h" | 92 #include "modules/indexeddb/InspectorIndexedDBAgent.h" |
| 93 #include "modules/push_messaging/PushController.h" | |
| 94 #include "platform/ContextMenu.h" | 93 #include "platform/ContextMenu.h" |
| 95 #include "platform/ContextMenuItem.h" | 94 #include "platform/ContextMenuItem.h" |
| 96 #include "platform/Cursor.h" | 95 #include "platform/Cursor.h" |
| 97 #include "platform/KeyboardCodes.h" | 96 #include "platform/KeyboardCodes.h" |
| 98 #include "platform/Logging.h" | 97 #include "platform/Logging.h" |
| 99 #include "platform/NotImplemented.h" | 98 #include "platform/NotImplemented.h" |
| 100 #include "platform/OverscrollTheme.h" | 99 #include "platform/OverscrollTheme.h" |
| 101 #include "platform/PlatformGestureEvent.h" | 100 #include "platform/PlatformGestureEvent.h" |
| 102 #include "platform/PlatformKeyboardEvent.h" | 101 #include "platform/PlatformKeyboardEvent.h" |
| 103 #include "platform/PlatformMouseEvent.h" | 102 #include "platform/PlatformMouseEvent.h" |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); | 439 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); |
| 441 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 440 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
| 442 InspectorIndexedDBAgent::provideTo(m_page.get()); | 441 InspectorIndexedDBAgent::provideTo(m_page.get()); |
| 443 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 442 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
| 444 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); | 443 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); |
| 445 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); | 444 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); |
| 446 | 445 |
| 447 m_page->makeOrdinary(); | 446 m_page->makeOrdinary(); |
| 448 | 447 |
| 449 if (m_client) { | 448 if (m_client) { |
| 450 providePushControllerTo(*m_page, m_client->webPushClient()); | |
| 451 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 449 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
| 452 setVisibilityState(m_client->visibilityState(), true); | 450 setVisibilityState(m_client->visibilityState(), true); |
| 453 } | 451 } |
| 454 | 452 |
| 455 initializeLayerTreeView(); | 453 initializeLayerTreeView(); |
| 456 } | 454 } |
| 457 | 455 |
| 458 WebViewImpl::~WebViewImpl() | 456 WebViewImpl::~WebViewImpl() |
| 459 { | 457 { |
| 460 ASSERT(!m_page); | 458 ASSERT(!m_page); |
| (...skipping 4034 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4495 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4493 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4496 | 4494 |
| 4497 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4495 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4498 return false; | 4496 return false; |
| 4499 | 4497 |
| 4500 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4498 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4501 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4499 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4502 } | 4500 } |
| 4503 | 4501 |
| 4504 } // namespace blink | 4502 } // namespace blink |
| OLD | NEW |