OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
105 #include "content/renderer/render_process.h" | 105 #include "content/renderer/render_process.h" |
106 #include "content/renderer/render_thread_impl.h" | 106 #include "content/renderer/render_thread_impl.h" |
107 #include "content/renderer/render_view_impl_params.h" | 107 #include "content/renderer/render_view_impl_params.h" |
108 #include "content/renderer/render_view_mouse_lock_dispatcher.h" | 108 #include "content/renderer/render_view_mouse_lock_dispatcher.h" |
109 #include "content/renderer/render_widget_fullscreen_pepper.h" | 109 #include "content/renderer/render_widget_fullscreen_pepper.h" |
110 #include "content/renderer/renderer_date_time_picker.h" | 110 #include "content/renderer/renderer_date_time_picker.h" |
111 #include "content/renderer/renderer_webapplicationcachehost_impl.h" | 111 #include "content/renderer/renderer_webapplicationcachehost_impl.h" |
112 #include "content/renderer/renderer_webcolorchooser_impl.h" | 112 #include "content/renderer/renderer_webcolorchooser_impl.h" |
113 #include "content/renderer/speech_recognition_dispatcher.h" | 113 #include "content/renderer/speech_recognition_dispatcher.h" |
114 #include "content/renderer/text_input_client_observer.h" | 114 #include "content/renderer/text_input_client_observer.h" |
115 #include "content/renderer/tts_dispatcher.h" | |
115 #include "content/renderer/v8_value_converter_impl.h" | 116 #include "content/renderer/v8_value_converter_impl.h" |
116 #include "content/renderer/web_ui_extension.h" | 117 #include "content/renderer/web_ui_extension.h" |
117 #include "content/renderer/web_ui_extension_data.h" | 118 #include "content/renderer/web_ui_extension_data.h" |
118 #include "content/renderer/webplugin_delegate_proxy.h" | 119 #include "content/renderer/webplugin_delegate_proxy.h" |
119 #include "content/renderer/websharedworker_proxy.h" | 120 #include "content/renderer/websharedworker_proxy.h" |
120 #include "media/base/audio_renderer_mixer_input.h" | 121 #include "media/base/audio_renderer_mixer_input.h" |
121 #include "media/base/filter_collection.h" | 122 #include "media/base/filter_collection.h" |
122 #include "media/base/media_switches.h" | 123 #include "media/base/media_switches.h" |
123 #include "media/filters/audio_renderer_impl.h" | 124 #include "media/filters/audio_renderer_impl.h" |
124 #include "media/filters/gpu_video_decoder.h" | 125 #include "media/filters/gpu_video_decoder.h" |
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
626 selection_range_(ui::Range::InvalidRange()), | 627 selection_range_(ui::Range::InvalidRange()), |
627 cached_is_main_frame_pinned_to_left_(false), | 628 cached_is_main_frame_pinned_to_left_(false), |
628 cached_is_main_frame_pinned_to_right_(false), | 629 cached_is_main_frame_pinned_to_right_(false), |
629 cached_has_main_frame_horizontal_scrollbar_(false), | 630 cached_has_main_frame_horizontal_scrollbar_(false), |
630 cached_has_main_frame_vertical_scrollbar_(false), | 631 cached_has_main_frame_vertical_scrollbar_(false), |
631 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), | 632 ALLOW_THIS_IN_INITIALIZER_LIST(cookie_jar_(this)), |
632 notification_provider_(NULL), | 633 notification_provider_(NULL), |
633 geolocation_dispatcher_(NULL), | 634 geolocation_dispatcher_(NULL), |
634 input_tag_speech_dispatcher_(NULL), | 635 input_tag_speech_dispatcher_(NULL), |
635 speech_recognition_dispatcher_(NULL), | 636 speech_recognition_dispatcher_(NULL), |
637 tts_dispatcher_(NULL), | |
636 device_orientation_dispatcher_(NULL), | 638 device_orientation_dispatcher_(NULL), |
637 media_stream_dispatcher_(NULL), | 639 media_stream_dispatcher_(NULL), |
638 browser_plugin_manager_(NULL), | 640 browser_plugin_manager_(NULL), |
639 media_stream_impl_(NULL), | 641 media_stream_impl_(NULL), |
640 devtools_agent_(NULL), | 642 devtools_agent_(NULL), |
641 accessibility_mode_(AccessibilityModeOff), | 643 accessibility_mode_(AccessibilityModeOff), |
642 renderer_accessibility_(NULL), | 644 renderer_accessibility_(NULL), |
643 java_bridge_dispatcher_(NULL), | 645 java_bridge_dispatcher_(NULL), |
644 mouse_lock_dispatcher_(NULL), | 646 mouse_lock_dispatcher_(NULL), |
645 favicon_helper_(NULL), | 647 favicon_helper_(NULL), |
(...skipping 5770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6416 } | 6418 } |
6417 | 6419 |
6418 WebKit::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { | 6420 WebKit::WebSpeechRecognizer* RenderViewImpl::speechRecognizer() { |
6419 #if defined(ENABLE_INPUT_SPEECH) | 6421 #if defined(ENABLE_INPUT_SPEECH) |
6420 if (!speech_recognition_dispatcher_) | 6422 if (!speech_recognition_dispatcher_) |
6421 speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); | 6423 speech_recognition_dispatcher_ = new SpeechRecognitionDispatcher(this); |
6422 #endif | 6424 #endif |
6423 return speech_recognition_dispatcher_; | 6425 return speech_recognition_dispatcher_; |
6424 } | 6426 } |
6425 | 6427 |
6428 WebKit::WebSpeechSynthesis* RenderViewImpl::speechSynthesis() { | |
6429 //#if defined(ENABLE_SPEECH_SYNTHESIS) | |
tommi (sloooow) - chröme
2013/03/07 13:04:46
uncomment or remove?
dmazzoni
2013/03/19 17:30:22
Done.
| |
6430 if (!tts_dispatcher_) | |
6431 tts_dispatcher_ = new TtsDispatcher(this); | |
6432 //#endif | |
6433 return tts_dispatcher_; | |
6434 } | |
6435 | |
6426 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { | 6436 WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() { |
6427 if (!device_orientation_dispatcher_) | 6437 if (!device_orientation_dispatcher_) |
6428 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); | 6438 device_orientation_dispatcher_ = new DeviceOrientationDispatcher(this); |
6429 return device_orientation_dispatcher_; | 6439 return device_orientation_dispatcher_; |
6430 } | 6440 } |
6431 | 6441 |
6432 void RenderViewImpl::zoomLimitsChanged(double minimum_level, | 6442 void RenderViewImpl::zoomLimitsChanged(double minimum_level, |
6433 double maximum_level) { | 6443 double maximum_level) { |
6434 // For now, don't remember plugin zoom values. We don't want to mix them with | 6444 // For now, don't remember plugin zoom values. We don't want to mix them with |
6435 // normal web content (i.e. a fixed layout plugin would usually want them | 6445 // normal web content (i.e. a fixed layout plugin would usually want them |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6754 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6764 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6755 RenderProcess::current()->ReleaseTransportDIB(dib); | 6765 RenderProcess::current()->ReleaseTransportDIB(dib); |
6756 } | 6766 } |
6757 | 6767 |
6758 void RenderViewImpl::DidCommitCompositorFrame() { | 6768 void RenderViewImpl::DidCommitCompositorFrame() { |
6759 RenderWidget::DidCommitCompositorFrame(); | 6769 RenderWidget::DidCommitCompositorFrame(); |
6760 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6770 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
6761 } | 6771 } |
6762 | 6772 |
6763 } // namespace content | 6773 } // namespace content |
OLD | NEW |