OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 #include "content/renderer/content_renderer_client.h" | 42 #include "content/renderer/content_renderer_client.h" |
43 #include "content/renderer/devtools_agent.h" | 43 #include "content/renderer/devtools_agent.h" |
44 #include "content/renderer/device_orientation_dispatcher.h" | 44 #include "content/renderer/device_orientation_dispatcher.h" |
45 #include "content/renderer/mhtml_generator.h" | 45 #include "content/renderer/mhtml_generator.h" |
46 #include "content/renderer/external_popup_menu.h" | 46 #include "content/renderer/external_popup_menu.h" |
47 #include "content/renderer/geolocation_dispatcher.h" | 47 #include "content/renderer/geolocation_dispatcher.h" |
48 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" | 48 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" |
49 #include "content/renderer/load_progress_tracker.h" | 49 #include "content/renderer/load_progress_tracker.h" |
50 #include "content/renderer/media/audio_message_filter.h" | 50 #include "content/renderer/media/audio_message_filter.h" |
51 #include "content/renderer/media/audio_renderer_impl.h" | 51 #include "content/renderer/media/audio_renderer_impl.h" |
| 52 #include "content/renderer/media/content_media_log.h" |
52 #include "content/renderer/media/media_stream_impl.h" | 53 #include "content/renderer/media/media_stream_impl.h" |
53 #include "content/renderer/navigation_state.h" | 54 #include "content/renderer/navigation_state.h" |
54 #include "content/renderer/notification_provider.h" | 55 #include "content/renderer/notification_provider.h" |
55 #include "content/renderer/p2p/socket_dispatcher.h" | 56 #include "content/renderer/p2p/socket_dispatcher.h" |
56 #include "content/renderer/plugin_channel_host.h" | 57 #include "content/renderer/plugin_channel_host.h" |
57 #include "content/renderer/render_process.h" | 58 #include "content/renderer/render_process.h" |
58 #include "content/renderer/render_thread.h" | 59 #include "content/renderer/render_thread.h" |
59 #include "content/renderer/render_view_observer.h" | 60 #include "content/renderer/render_view_observer.h" |
60 #include "content/renderer/render_view_visitor.h" | 61 #include "content/renderer/render_view_visitor.h" |
61 #include "content/renderer/render_widget_fullscreen_pepper.h" | 62 #include "content/renderer/render_widget_fullscreen_pepper.h" |
(...skipping 1887 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1949 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); | 1950 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); |
1950 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( | 1951 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( |
1951 new webkit_glue::VideoRendererImpl(pts_logging)); | 1952 new webkit_glue::VideoRendererImpl(pts_logging)); |
1952 collection->AddVideoRenderer(renderer); | 1953 collection->AddVideoRenderer(renderer); |
1953 video_renderer = renderer; | 1954 video_renderer = renderer; |
1954 | 1955 |
1955 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( | 1956 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
1956 new webkit_glue::WebMediaPlayerImpl(client, | 1957 new webkit_glue::WebMediaPlayerImpl(client, |
1957 collection.release(), | 1958 collection.release(), |
1958 message_loop_factory.release(), | 1959 message_loop_factory.release(), |
1959 media_stream_impl_.get())); | 1960 media_stream_impl_.get(), |
| 1961 new ContentMediaLog())); |
1960 if (!result->Initialize(frame, | 1962 if (!result->Initialize(frame, |
1961 cmd_line->HasSwitch(switches::kSimpleDataSource), | 1963 cmd_line->HasSwitch(switches::kSimpleDataSource), |
1962 video_renderer)) { | 1964 video_renderer)) { |
1963 return NULL; | 1965 return NULL; |
1964 } | 1966 } |
1965 return result.release(); | 1967 return result.release(); |
1966 } | 1968 } |
1967 | 1969 |
1968 WebApplicationCacheHost* RenderView::createApplicationCacheHost( | 1970 WebApplicationCacheHost* RenderView::createApplicationCacheHost( |
1969 WebFrame* frame, WebApplicationCacheHostClient* client) { | 1971 WebFrame* frame, WebApplicationCacheHostClient* client) { |
(...skipping 2415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4385 } | 4387 } |
4386 #endif | 4388 #endif |
4387 | 4389 |
4388 void RenderView::OnContextMenuClosed( | 4390 void RenderView::OnContextMenuClosed( |
4389 const webkit_glue::CustomContextMenuContext& custom_context) { | 4391 const webkit_glue::CustomContextMenuContext& custom_context) { |
4390 if (custom_context.is_pepper_menu) | 4392 if (custom_context.is_pepper_menu) |
4391 pepper_delegate_.OnContextMenuClosed(custom_context); | 4393 pepper_delegate_.OnContextMenuClosed(custom_context); |
4392 else | 4394 else |
4393 context_menu_node_.reset(); | 4395 context_menu_node_.reset(); |
4394 } | 4396 } |
OLD | NEW |