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

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

Issue 9597016: Fold media::MessageLoopFactoryImpl into media::MessageLoopFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 8 years, 9 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
« no previous file with comments | « no previous file | media/base/message_loop_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 79 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
80 #include "content/renderer/renderer_webstoragenamespace_impl.h" 80 #include "content/renderer/renderer_webstoragenamespace_impl.h"
81 #include "content/renderer/speech_input_dispatcher.h" 81 #include "content/renderer/speech_input_dispatcher.h"
82 #include "content/renderer/text_input_client_observer.h" 82 #include "content/renderer/text_input_client_observer.h"
83 #include "content/renderer/v8_value_converter_impl.h" 83 #include "content/renderer/v8_value_converter_impl.h"
84 #include "content/renderer/web_ui_bindings.h" 84 #include "content/renderer/web_ui_bindings.h"
85 #include "content/renderer/webplugin_delegate_proxy.h" 85 #include "content/renderer/webplugin_delegate_proxy.h"
86 #include "content/renderer/websharedworker_proxy.h" 86 #include "content/renderer/websharedworker_proxy.h"
87 #include "media/base/filter_collection.h" 87 #include "media/base/filter_collection.h"
88 #include "media/base/media_switches.h" 88 #include "media/base/media_switches.h"
89 #include "media/base/message_loop_factory_impl.h" 89 #include "media/base/message_loop_factory.h"
90 #include "media/filters/gpu_video_decoder.h" 90 #include "media/filters/gpu_video_decoder.h"
91 #include "net/base/escape.h" 91 #include "net/base/escape.h"
92 #include "net/base/net_errors.h" 92 #include "net/base/net_errors.h"
93 #include "net/http/http_util.h" 93 #include "net/http/http_util.h"
94 #include "ppapi/c/private/ppb_flash_net_connector.h" 94 #include "ppapi/c/private/ppb_flash_net_connector.h"
95 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec t.h" 95 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObjec t.h"
96 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h" 96 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
97 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" 97 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
98 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h" 98 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
99 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams. h" 99 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams. h"
(...skipping 2009 matching lines...) Expand 10 before | Expand all | Expand 10 after
2109 routing_id_); 2109 routing_id_);
2110 } 2110 }
2111 } 2111 }
2112 2112
2113 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 2113 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2114 WebFrame* frame, WebMediaPlayerClient* client) { 2114 WebFrame* frame, WebMediaPlayerClient* client) {
2115 FOR_EACH_OBSERVER( 2115 FOR_EACH_OBSERVER(
2116 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 2116 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
2117 2117
2118 media::MessageLoopFactory* message_loop_factory = 2118 media::MessageLoopFactory* message_loop_factory =
2119 new media::MessageLoopFactoryImpl(); 2119 new media::MessageLoopFactory();
2120 media::FilterCollection* collection = new media::FilterCollection(); 2120 media::FilterCollection* collection = new media::FilterCollection();
2121 RenderMediaLog* render_media_log = new RenderMediaLog(); 2121 RenderMediaLog* render_media_log = new RenderMediaLog();
2122 2122
2123 RenderAudioSourceProvider* audio_source_provider = NULL; 2123 RenderAudioSourceProvider* audio_source_provider = NULL;
2124 2124
2125 // Add in any custom filter factories first. 2125 // Add in any custom filter factories first.
2126 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 2126 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
2127 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 2127 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
2128 // audio_source_provider is a "provider" to WebKit, and a sink 2128 // audio_source_provider is a "provider" to WebKit, and a sink
2129 // from the perspective of the audio renderer. 2129 // from the perspective of the audio renderer.
(...skipping 2991 matching lines...) Expand 10 before | Expand all | Expand 10 after
5121 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5121 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5122 return !!RenderThreadImpl::current()->compositor_thread(); 5122 return !!RenderThreadImpl::current()->compositor_thread();
5123 } 5123 }
5124 5124
5125 void RenderViewImpl::OnJavaBridgeInit() { 5125 void RenderViewImpl::OnJavaBridgeInit() {
5126 DCHECK(!java_bridge_dispatcher_.get()); 5126 DCHECK(!java_bridge_dispatcher_.get());
5127 #if defined(ENABLE_JAVA_BRIDGE) 5127 #if defined(ENABLE_JAVA_BRIDGE)
5128 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5128 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5129 #endif 5129 #endif
5130 } 5130 }
OLDNEW
« no previous file with comments | « no previous file | media/base/message_loop_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698