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 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 #include "public/web/WebWindowFeatures.h" | 141 #include "public/web/WebWindowFeatures.h" |
142 #include "web/CompositionUnderlineVectorBuilder.h" | 142 #include "web/CompositionUnderlineVectorBuilder.h" |
143 #include "web/ContextFeaturesClientImpl.h" | 143 #include "web/ContextFeaturesClientImpl.h" |
144 #include "web/DatabaseClientImpl.h" | 144 #include "web/DatabaseClientImpl.h" |
145 #include "web/FullscreenController.h" | 145 #include "web/FullscreenController.h" |
146 #include "web/GraphicsLayerFactoryChromium.h" | 146 #include "web/GraphicsLayerFactoryChromium.h" |
147 #include "web/LinkHighlight.h" | 147 #include "web/LinkHighlight.h" |
148 #include "web/NavigatorContentUtilsClientImpl.h" | 148 #include "web/NavigatorContentUtilsClientImpl.h" |
149 #include "web/PopupContainer.h" | 149 #include "web/PopupContainer.h" |
150 #include "web/PrerendererClientImpl.h" | 150 #include "web/PrerendererClientImpl.h" |
| 151 #include "web/SpeechRecognitionClientProxy.h" |
151 #include "web/StorageQuotaClientImpl.h" | 152 #include "web/StorageQuotaClientImpl.h" |
152 #include "web/ValidationMessageClientImpl.h" | 153 #include "web/ValidationMessageClientImpl.h" |
153 #include "web/ViewportAnchor.h" | 154 #include "web/ViewportAnchor.h" |
154 #include "web/WebDevToolsAgentImpl.h" | 155 #include "web/WebDevToolsAgentImpl.h" |
155 #include "web/WebDevToolsAgentPrivate.h" | 156 #include "web/WebDevToolsAgentPrivate.h" |
156 #include "web/WebInputEventConversion.h" | 157 #include "web/WebInputEventConversion.h" |
157 #include "web/WebLocalFrameImpl.h" | 158 #include "web/WebLocalFrameImpl.h" |
158 #include "web/WebPagePopupImpl.h" | 159 #include "web/WebPagePopupImpl.h" |
159 #include "web/WebPluginContainerImpl.h" | 160 #include "web/WebPluginContainerImpl.h" |
160 #include "web/WebPopupMenuImpl.h" | 161 #include "web/WebPopupMenuImpl.h" |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
418 Page::PageClients pageClients; | 419 Page::PageClients pageClients; |
419 pageClients.chromeClient = &m_chromeClientImpl; | 420 pageClients.chromeClient = &m_chromeClientImpl; |
420 pageClients.contextMenuClient = &m_contextMenuClientImpl; | 421 pageClients.contextMenuClient = &m_contextMenuClientImpl; |
421 pageClients.editorClient = &m_editorClientImpl; | 422 pageClients.editorClient = &m_editorClientImpl; |
422 pageClients.dragClient = &m_dragClientImpl; | 423 pageClients.dragClient = &m_dragClientImpl; |
423 pageClients.inspectorClient = &m_inspectorClientImpl; | 424 pageClients.inspectorClient = &m_inspectorClientImpl; |
424 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; | 425 pageClients.spellCheckerClient = &m_spellCheckerClientImpl; |
425 | 426 |
426 m_page = adoptPtrWillBeNoop(new Page(pageClients)); | 427 m_page = adoptPtrWillBeNoop(new Page(pageClients)); |
427 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); | 428 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); |
| 429 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli
ent ? client->speechRecognizer() : 0)); |
428 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); | 430 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre
ate(this)); |
429 | 431 |
430 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); | 432 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); |
431 DeviceOrientationInspectorAgent::provideTo(*m_page); | 433 DeviceOrientationInspectorAgent::provideTo(*m_page); |
432 | 434 |
433 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); | 435 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent::
create(m_page.get())); |
434 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); | 436 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); |
435 InspectorIndexedDBAgent::provideTo(m_page.get()); | 437 InspectorIndexedDBAgent::provideTo(m_page.get()); |
436 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); | 438 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); |
437 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); | 439 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this
)); |
(...skipping 4109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4547 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4549 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4548 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4550 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4549 } | 4551 } |
4550 | 4552 |
4551 void WebViewImpl::forceNextWebGLContextCreationToFail() | 4553 void WebViewImpl::forceNextWebGLContextCreationToFail() |
4552 { | 4554 { |
4553 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); | 4555 WebGLRenderingContext::forceNextWebGLContextCreationToFail(); |
4554 } | 4556 } |
4555 | 4557 |
4556 } // namespace blink | 4558 } // namespace blink |
OLD | NEW |