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

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

Issue 11066123: Enable WebMediaPlayerMS only when ENABLE_WEBRTC is defined. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | no next file » | 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 2629 matching lines...) Expand 10 before | Expand all | Expand 10 after
2640 new RendererGpuVideoDecoderFactories( 2640 new RendererGpuVideoDecoderFactories(
2641 gpu_channel_host, factories_loop, context3d))); 2641 gpu_channel_host, factories_loop, context3d)));
2642 } 2642 }
2643 2643
2644 WebMediaPlayer* media_player = 2644 WebMediaPlayer* media_player =
2645 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2645 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2646 this, frame, client, AsWeakPtr(), collection, audio_source_provider, 2646 this, frame, client, AsWeakPtr(), collection, audio_source_provider,
2647 audio_source_provider, message_loop_factory, media_stream_impl_, 2647 audio_source_provider, message_loop_factory, media_stream_impl_,
2648 render_media_log); 2648 render_media_log);
2649 if (!media_player) { 2649 if (!media_player) {
2650 #if defined(ENABLE_WEBRTC)
2650 // TODO(wjia): when all patches related to WebMediaPlayerMS have been 2651 // TODO(wjia): when all patches related to WebMediaPlayerMS have been
2651 // landed, remove the switch. Refer to crbug.com/142988. 2652 // landed, remove the switch. Refer to crbug.com/142988.
2652 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) && 2653 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
2653 MediaStreamImpl::CheckMediaStream(url)) { 2654 MediaStreamImpl::CheckMediaStream(url)) {
2654 EnsureMediaStreamImpl(); 2655 EnsureMediaStreamImpl();
2655 return new webkit_media::WebMediaPlayerMS( 2656 return new webkit_media::WebMediaPlayerMS(
2656 frame, client, AsWeakPtr(), media_stream_impl_, render_media_log); 2657 frame, client, AsWeakPtr(), media_stream_impl_, render_media_log);
2657 } 2658 }
2659 #endif
2658 2660
2659 media_player = new webkit_media::WebMediaPlayerImpl( 2661 media_player = new webkit_media::WebMediaPlayerImpl(
2660 frame, client, AsWeakPtr(), collection, audio_source_provider, 2662 frame, client, AsWeakPtr(), collection, audio_source_provider,
2661 audio_source_provider, message_loop_factory, media_stream_impl_, 2663 audio_source_provider, message_loop_factory, media_stream_impl_,
2662 render_media_log); 2664 render_media_log);
2663 } 2665 }
2664 return media_player; 2666 return media_player;
2665 } 2667 }
2666 2668
2667 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 2669 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
(...skipping 3682 matching lines...) Expand 10 before | Expand all | Expand 10 after
6350 6352
6351 updating_frame_tree_ = true; 6353 updating_frame_tree_ = true;
6352 active_frame_id_map_.clear(); 6354 active_frame_id_map_.clear();
6353 6355
6354 target_process_id_ = process_id; 6356 target_process_id_ = process_id;
6355 target_routing_id_ = route_id; 6357 target_routing_id_ = route_id;
6356 CreateFrameTree(webview()->mainFrame(), frames); 6358 CreateFrameTree(webview()->mainFrame(), frames);
6357 6359
6358 updating_frame_tree_ = false; 6360 updating_frame_tree_ = false;
6359 } 6361 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698