| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 #include "public/web/WebRange.h" | 125 #include "public/web/WebRange.h" |
| 126 #include "public/web/WebTextInputInfo.h" | 126 #include "public/web/WebTextInputInfo.h" |
| 127 #include "public/web/WebViewClient.h" | 127 #include "public/web/WebViewClient.h" |
| 128 #include "public/web/WebWindowFeatures.h" | 128 #include "public/web/WebWindowFeatures.h" |
| 129 #include "web/CompositionUnderlineVectorBuilder.h" | 129 #include "web/CompositionUnderlineVectorBuilder.h" |
| 130 #include "web/ContextFeaturesClientImpl.h" | 130 #include "web/ContextFeaturesClientImpl.h" |
| 131 #include "web/DatabaseClientImpl.h" | 131 #include "web/DatabaseClientImpl.h" |
| 132 #include "web/FullscreenController.h" | 132 #include "web/FullscreenController.h" |
| 133 #include "web/GraphicsLayerFactoryChromium.h" | 133 #include "web/GraphicsLayerFactoryChromium.h" |
| 134 #include "web/LinkHighlight.h" | 134 #include "web/LinkHighlight.h" |
| 135 #include "web/MediaKeysClientImpl.h" |
| 135 #include "web/PopupContainer.h" | 136 #include "web/PopupContainer.h" |
| 136 #include "web/PrerendererClientImpl.h" | 137 #include "web/PrerendererClientImpl.h" |
| 137 #include "web/SpeechRecognitionClientProxy.h" | 138 #include "web/SpeechRecognitionClientProxy.h" |
| 138 #include "web/StorageQuotaClientImpl.h" | 139 #include "web/StorageQuotaClientImpl.h" |
| 139 #include "web/ValidationMessageClientImpl.h" | 140 #include "web/ValidationMessageClientImpl.h" |
| 140 #include "web/ViewportAnchor.h" | 141 #include "web/ViewportAnchor.h" |
| 141 #include "web/WebDevToolsAgentImpl.h" | 142 #include "web/WebDevToolsAgentImpl.h" |
| 142 #include "web/WebDevToolsAgentPrivate.h" | 143 #include "web/WebDevToolsAgentPrivate.h" |
| 143 #include "web/WebInputEventConversion.h" | 144 #include "web/WebInputEventConversion.h" |
| 144 #include "web/WebLocalFrameImpl.h" | 145 #include "web/WebLocalFrameImpl.h" |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 pageClients.chromeClient = &m_chromeClientImpl; | 400 pageClients.chromeClient = &m_chromeClientImpl; |
| 400 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 401 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
| 401 pageClients.editorClient = &m_editorClientImpl; | 402 pageClients.editorClient = &m_editorClientImpl; |
| 402 pageClients.dragClient = &m_dragClientImpl; | 403 pageClients.dragClient = &m_dragClientImpl; |
| 403 pageClients.inspectorClient = &m_inspectorClientImpl; | 404 pageClients.inspectorClient = &m_inspectorClientImpl; |
| 404 pageClients.backForwardClient = &m_backForwardClientImpl; | 405 pageClients.backForwardClient = &m_backForwardClientImpl; |
| 405 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 406 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
| 406 pageClients.storageClient = &m_storageClientImpl; | 407 pageClients.storageClient = &m_storageClientImpl; |
| 407 | 408 |
| 408 m_page = adoptPtrWillBeNoop(new Page(pageClients)); | 409 m_page = adoptPtrWillBeNoop(new Page(pageClients)); |
| 409 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 410 MediaKeysController::provideMediaKeysTo(*m_page, MediaKeysClientImpl::create
()); |
| 410 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); | 411 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); |
| 411 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); | 412 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); |
| 412 | 413 |
| 413 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); | 414 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); |
| 414 DeviceOrientationInspectorAgent::provideTo(*m_page); | 415 DeviceOrientationInspectorAgent::provideTo(*m_page); |
| 415 | 416 |
| 416 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); | 417 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); |
| 417 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 418 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
| 418 InspectorIndexedDBAgent::provideTo(m_page.get()); | 419 InspectorIndexedDBAgent::provideTo(m_page.get()); |
| 419 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 420 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
| (...skipping 3683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4103 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
| 4104 | 4105 |
| 4105 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
| 4106 return false; | 4107 return false; |
| 4107 | 4108 |
| 4108 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
| 4109 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4110 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
| 4110 } | 4111 } |
| 4111 | 4112 |
| 4112 } // namespace blink | 4113 } // namespace blink |
| OLD | NEW |