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 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
442 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); | 441 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); |
443 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 442 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
444 InspectorIndexedDBAgent::provideTo(m_page.get()); | 443 InspectorIndexedDBAgent::provideTo(m_page.get()); |
445 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 444 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
446 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); | 445 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); |
447 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); | 446 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi
derImpl::create()); |
448 | 447 |
449 m_page->makeOrdinary(); | 448 m_page->makeOrdinary(); |
450 | 449 |
451 if (m_client) { | 450 if (m_client) { |
452 providePushControllerTo(*m_page, m_client->webPushClient()); | |
453 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); | 451 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); |
454 setVisibilityState(m_client->visibilityState(), true); | 452 setVisibilityState(m_client->visibilityState(), true); |
455 } | 453 } |
456 | 454 |
457 initializeLayerTreeView(); | 455 initializeLayerTreeView(); |
458 } | 456 } |
459 | 457 |
460 WebViewImpl::~WebViewImpl() | 458 WebViewImpl::~WebViewImpl() |
461 { | 459 { |
462 ASSERT(!m_page); | 460 ASSERT(!m_page); |
(...skipping 4010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4473 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4471 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4474 | 4472 |
4475 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4473 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4476 return false; | 4474 return false; |
4477 | 4475 |
4478 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4476 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4479 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4477 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4480 } | 4478 } |
4481 | 4479 |
4482 } // namespace blink | 4480 } // namespace blink |
OLD | NEW |