| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 #include "content/renderer/drop_data_builder.h" | 80 #include "content/renderer/drop_data_builder.h" |
| 81 #include "content/renderer/external_popup_menu.h" | 81 #include "content/renderer/external_popup_menu.h" |
| 82 #include "content/renderer/gpu/render_widget_compositor.h" | 82 #include "content/renderer/gpu/render_widget_compositor.h" |
| 83 #include "content/renderer/history_controller.h" | 83 #include "content/renderer/history_controller.h" |
| 84 #include "content/renderer/history_serialization.h" | 84 #include "content/renderer/history_serialization.h" |
| 85 #include "content/renderer/idle_user_detector.h" | 85 #include "content/renderer/idle_user_detector.h" |
| 86 #include "content/renderer/ime_event_guard.h" | 86 #include "content/renderer/ime_event_guard.h" |
| 87 #include "content/renderer/input/input_handler_manager.h" | 87 #include "content/renderer/input/input_handler_manager.h" |
| 88 #include "content/renderer/internal_document_state_data.h" | 88 #include "content/renderer/internal_document_state_data.h" |
| 89 #include "content/renderer/media/audio_device_factory.h" | 89 #include "content/renderer/media/audio_device_factory.h" |
| 90 #include "content/renderer/media/media_stream_dispatcher.h" | |
| 91 #include "content/renderer/media/video_capture_impl_manager.h" | 90 #include "content/renderer/media/video_capture_impl_manager.h" |
| 92 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" | 91 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
| 93 #include "content/renderer/memory_benchmarking_extension.h" | 92 #include "content/renderer/memory_benchmarking_extension.h" |
| 94 #include "content/renderer/mhtml_generator.h" | 93 #include "content/renderer/mhtml_generator.h" |
| 95 #include "content/renderer/render_frame_impl.h" | 94 #include "content/renderer/render_frame_impl.h" |
| 96 #include "content/renderer/render_frame_proxy.h" | 95 #include "content/renderer/render_frame_proxy.h" |
| 97 #include "content/renderer/render_process.h" | 96 #include "content/renderer/render_process.h" |
| 98 #include "content/renderer/render_thread_impl.h" | 97 #include "content/renderer/render_thread_impl.h" |
| 99 #include "content/renderer/render_view_impl_params.h" | 98 #include "content/renderer/render_view_impl_params.h" |
| 100 #include "content/renderer/render_view_mouse_lock_dispatcher.h" | 99 #include "content/renderer/render_view_mouse_lock_dispatcher.h" |
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 history_list_offset_(-1), | 629 history_list_offset_(-1), |
| 631 history_list_length_(0), | 630 history_list_length_(0), |
| 632 frames_in_progress_(0), | 631 frames_in_progress_(0), |
| 633 target_url_status_(TARGET_NONE), | 632 target_url_status_(TARGET_NONE), |
| 634 uses_temporary_zoom_level_(false), | 633 uses_temporary_zoom_level_(false), |
| 635 #if defined(OS_ANDROID) | 634 #if defined(OS_ANDROID) |
| 636 top_controls_constraints_(cc::BOTH), | 635 top_controls_constraints_(cc::BOTH), |
| 637 #endif | 636 #endif |
| 638 has_scrolled_focused_editable_node_into_rect_(false), | 637 has_scrolled_focused_editable_node_into_rect_(false), |
| 639 speech_recognition_dispatcher_(NULL), | 638 speech_recognition_dispatcher_(NULL), |
| 640 media_stream_dispatcher_(NULL), | |
| 641 browser_plugin_manager_(NULL), | 639 browser_plugin_manager_(NULL), |
| 642 devtools_agent_(NULL), | 640 devtools_agent_(NULL), |
| 643 accessibility_mode_(AccessibilityModeOff), | 641 accessibility_mode_(AccessibilityModeOff), |
| 644 renderer_accessibility_(NULL), | 642 renderer_accessibility_(NULL), |
| 645 mouse_lock_dispatcher_(NULL), | 643 mouse_lock_dispatcher_(NULL), |
| 646 #if defined(OS_ANDROID) | 644 #if defined(OS_ANDROID) |
| 647 expected_content_intent_id_(0), | 645 expected_content_intent_id_(0), |
| 648 #endif | 646 #endif |
| 649 #if defined(OS_WIN) | 647 #if defined(OS_WIN) |
| 650 focused_plugin_id_(-1), | 648 focused_plugin_id_(-1), |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 | 751 |
| 754 if (!params->frame_name.empty()) | 752 if (!params->frame_name.empty()) |
| 755 webview()->mainFrame()->setName(params->frame_name); | 753 webview()->mainFrame()->setName(params->frame_name); |
| 756 | 754 |
| 757 // TODO(davidben): Move this state from Blink into content. | 755 // TODO(davidben): Move this state from Blink into content. |
| 758 if (params->window_was_created_with_opener) | 756 if (params->window_was_created_with_opener) |
| 759 webview()->setOpenedByDOM(); | 757 webview()->setOpenedByDOM(); |
| 760 | 758 |
| 761 OnSetRendererPrefs(params->renderer_prefs); | 759 OnSetRendererPrefs(params->renderer_prefs); |
| 762 | 760 |
| 763 #if defined(ENABLE_WEBRTC) | |
| 764 if (!media_stream_dispatcher_) | |
| 765 media_stream_dispatcher_ = new MediaStreamDispatcher(this); | |
| 766 #endif | |
| 767 | |
| 768 new MHTMLGenerator(this); | 761 new MHTMLGenerator(this); |
| 769 #if defined(OS_MACOSX) | 762 #if defined(OS_MACOSX) |
| 770 new TextInputClientObserver(this); | 763 new TextInputClientObserver(this); |
| 771 #endif // defined(OS_MACOSX) | 764 #endif // defined(OS_MACOSX) |
| 772 | 765 |
| 773 // The next group of objects all implement RenderViewObserver, so are deleted | 766 // The next group of objects all implement RenderViewObserver, so are deleted |
| 774 // along with the RenderView automatically. | 767 // along with the RenderView automatically. |
| 775 devtools_agent_ = new DevToolsAgent(this); | 768 devtools_agent_ = new DevToolsAgent(this); |
| 776 if (RenderWidgetCompositor* rwc = compositor()) { | 769 if (RenderWidgetCompositor* rwc = compositor()) { |
| 777 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); | 770 webview()->devToolsAgent()->setLayerTreeId(rwc->GetLayerTreeId()); |
| (...skipping 3204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3982 std::vector<gfx::Size> sizes; | 3975 std::vector<gfx::Size> sizes; |
| 3983 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 3976 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
| 3984 if (!url.isEmpty()) | 3977 if (!url.isEmpty()) |
| 3985 urls.push_back( | 3978 urls.push_back( |
| 3986 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 3979 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
| 3987 } | 3980 } |
| 3988 SendUpdateFaviconURL(urls); | 3981 SendUpdateFaviconURL(urls); |
| 3989 } | 3982 } |
| 3990 | 3983 |
| 3991 } // namespace content | 3984 } // namespace content |
| OLD | NEW |