| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 #include "chrome/renderer/extensions/extension_process_bindings.h" | 59 #include "chrome/renderer/extensions/extension_process_bindings.h" |
| 60 #include "chrome/renderer/extensions/extension_renderer_info.h" | 60 #include "chrome/renderer/extensions/extension_renderer_info.h" |
| 61 #include "chrome/renderer/extensions/renderer_extension_bindings.h" | 61 #include "chrome/renderer/extensions/renderer_extension_bindings.h" |
| 62 #include "chrome/renderer/external_host_bindings.h" | 62 #include "chrome/renderer/external_host_bindings.h" |
| 63 #include "chrome/renderer/external_popup_menu.h" | 63 #include "chrome/renderer/external_popup_menu.h" |
| 64 #include "chrome/renderer/geolocation_dispatcher_old.h" | 64 #include "chrome/renderer/geolocation_dispatcher_old.h" |
| 65 #include "chrome/renderer/ggl/ggl.h" | 65 #include "chrome/renderer/ggl/ggl.h" |
| 66 #include "chrome/renderer/localized_error.h" | 66 #include "chrome/renderer/localized_error.h" |
| 67 #include "chrome/renderer/media/audio_renderer_impl.h" | 67 #include "chrome/renderer/media/audio_renderer_impl.h" |
| 68 #include "chrome/renderer/media/ipc_video_decoder.h" | 68 #include "chrome/renderer/media/ipc_video_decoder.h" |
| 69 #include "chrome/renderer/media/ipc_video_renderer.h" | |
| 70 #include "chrome/renderer/navigation_state.h" | 69 #include "chrome/renderer/navigation_state.h" |
| 71 #include "chrome/renderer/notification_provider.h" | 70 #include "chrome/renderer/notification_provider.h" |
| 72 #include "chrome/renderer/page_click_tracker.h" | 71 #include "chrome/renderer/page_click_tracker.h" |
| 73 #include "chrome/renderer/password_autocomplete_manager.h" | 72 #include "chrome/renderer/password_autocomplete_manager.h" |
| 74 #include "chrome/renderer/plugin_channel_host.h" | 73 #include "chrome/renderer/plugin_channel_host.h" |
| 75 #include "chrome/renderer/print_web_view_helper.h" | 74 #include "chrome/renderer/print_web_view_helper.h" |
| 76 #include "chrome/renderer/render_process.h" | 75 #include "chrome/renderer/render_process.h" |
| 77 #include "chrome/renderer/render_thread.h" | 76 #include "chrome/renderer/render_thread.h" |
| 78 #include "chrome/renderer/render_view_visitor.h" | 77 #include "chrome/renderer/render_view_visitor.h" |
| 79 #include "chrome/renderer/render_widget_fullscreen.h" | 78 #include "chrome/renderer/render_widget_fullscreen.h" |
| (...skipping 2573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2653 webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered = | 2652 webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered = |
| 2654 new webkit_glue::MediaResourceLoaderBridgeFactory( | 2653 new webkit_glue::MediaResourceLoaderBridgeFactory( |
| 2655 GURL(frame->url()), // referrer | 2654 GURL(frame->url()), // referrer |
| 2656 "null", // frame origin | 2655 "null", // frame origin |
| 2657 "null", // main_frame_origin | 2656 "null", // main_frame_origin |
| 2658 base::GetCurrentProcId(), | 2657 base::GetCurrentProcId(), |
| 2659 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, | 2658 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, |
| 2660 routing_id()); | 2659 routing_id()); |
| 2661 | 2660 |
| 2662 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; | 2661 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; |
| 2663 if (cmd_line->HasSwitch(switches::kEnableVideoLayering)) { | 2662 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); |
| 2664 scoped_refptr<IPCVideoRenderer> renderer( | 2663 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( |
| 2665 new IPCVideoRenderer(routing_id_)); | 2664 new webkit_glue::VideoRendererImpl(pts_logging)); |
| 2666 collection->AddFilter(renderer); | 2665 collection->AddFilter(renderer); |
| 2667 video_renderer = renderer; | 2666 video_renderer = renderer; |
| 2668 } else { | |
| 2669 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); | |
| 2670 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( | |
| 2671 new webkit_glue::VideoRendererImpl(pts_logging)); | |
| 2672 collection->AddFilter(renderer); | |
| 2673 video_renderer = renderer; | |
| 2674 } | |
| 2675 | 2667 |
| 2676 return new webkit_glue::WebMediaPlayerImpl( | 2668 return new webkit_glue::WebMediaPlayerImpl( |
| 2677 client, collection.release(), bridge_factory_simple, | 2669 client, collection.release(), bridge_factory_simple, |
| 2678 bridge_factory_buffered, | 2670 bridge_factory_buffered, |
| 2679 cmd_line->HasSwitch(switches::kSimpleDataSource),video_renderer); | 2671 cmd_line->HasSwitch(switches::kSimpleDataSource),video_renderer); |
| 2680 } | 2672 } |
| 2681 | 2673 |
| 2682 WebApplicationCacheHost* RenderView::createApplicationCacheHost( | 2674 WebApplicationCacheHost* RenderView::createApplicationCacheHost( |
| 2683 WebFrame* frame, WebApplicationCacheHostClient* client) { | 2675 WebFrame* frame, WebApplicationCacheHostClient* client) { |
| 2684 return new RendererWebApplicationCacheHostImpl( | 2676 return new RendererWebApplicationCacheHostImpl( |
| (...skipping 3490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6175 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 6167 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
| 6176 message_id); | 6168 message_id); |
| 6177 } | 6169 } |
| 6178 | 6170 |
| 6179 #if defined(OS_MACOSX) | 6171 #if defined(OS_MACOSX) |
| 6180 void RenderView::OnSelectPopupMenuItem(int selected_index) { | 6172 void RenderView::OnSelectPopupMenuItem(int selected_index) { |
| 6181 external_popup_menu_->DidSelectItem(selected_index); | 6173 external_popup_menu_->DidSelectItem(selected_index); |
| 6182 external_popup_menu_.reset(); | 6174 external_popup_menu_.reset(); |
| 6183 } | 6175 } |
| 6184 #endif | 6176 #endif |
| OLD | NEW |