Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Side by Side Diff: content/renderer/render_view.cc

Issue 7480032: Plumb media data from renderers up to MediaInternals in the browser process. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasing onto http://codereview.chromium.org/7491048 prior to (hopefully) relanding. Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/media_stream_impl.h" 52 #include "content/renderer/media/media_stream_impl.h"
53 #include "content/renderer/media/render_media_log.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"
62 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 63 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
(...skipping 1898 matching lines...) Expand 10 before | Expand all | Expand 10 after
1961 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); 1962 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
1962 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( 1963 scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
1963 new webkit_glue::VideoRendererImpl(pts_logging)); 1964 new webkit_glue::VideoRendererImpl(pts_logging));
1964 collection->AddVideoRenderer(renderer); 1965 collection->AddVideoRenderer(renderer);
1965 video_renderer = renderer; 1966 video_renderer = renderer;
1966 1967
1967 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( 1968 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
1968 new webkit_glue::WebMediaPlayerImpl(client, 1969 new webkit_glue::WebMediaPlayerImpl(client,
1969 collection.release(), 1970 collection.release(),
1970 message_loop_factory.release(), 1971 message_loop_factory.release(),
1971 media_stream_impl_.get())); 1972 media_stream_impl_.get(),
1973 new RenderMediaLog()));
1972 if (!result->Initialize(frame, 1974 if (!result->Initialize(frame,
1973 cmd_line->HasSwitch(switches::kSimpleDataSource), 1975 cmd_line->HasSwitch(switches::kSimpleDataSource),
1974 video_renderer)) { 1976 video_renderer)) {
1975 return NULL; 1977 return NULL;
1976 } 1978 }
1977 return result.release(); 1979 return result.release();
1978 } 1980 }
1979 1981
1980 WebApplicationCacheHost* RenderView::createApplicationCacheHost( 1982 WebApplicationCacheHost* RenderView::createApplicationCacheHost(
1981 WebFrame* frame, WebApplicationCacheHostClient* client) { 1983 WebFrame* frame, WebApplicationCacheHostClient* client) {
(...skipping 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after
4433 } 4435 }
4434 #endif 4436 #endif
4435 4437
4436 void RenderView::OnContextMenuClosed( 4438 void RenderView::OnContextMenuClosed(
4437 const webkit_glue::CustomContextMenuContext& custom_context) { 4439 const webkit_glue::CustomContextMenuContext& custom_context) {
4438 if (custom_context.is_pepper_menu) 4440 if (custom_context.is_pepper_menu)
4439 pepper_delegate_.OnContextMenuClosed(custom_context); 4441 pepper_delegate_.OnContextMenuClosed(custom_context);
4440 else 4442 else
4441 context_menu_node_.reset(); 4443 context_menu_node_.reset();
4442 } 4444 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698