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

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

Issue 2696663002: Media Remoting: Don't auto suspend the media pipeline. (Closed)
Patch Set: Fix tests. Created 3 years, 10 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
« no previous file with comments | « no previous file | media/base/media_observer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2889 matching lines...) Expand 10 before | Expand all | Expand 10 after
2900 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(), 2900 frame_, client, encrypted_client, GetWebMediaPlayerDelegate(),
2901 std::move(media_renderer_factory), url_index_, params); 2901 std::move(media_renderer_factory), url_index_, params);
2902 2902
2903 #if defined(OS_ANDROID) // WMPI_CAST 2903 #if defined(OS_ANDROID) // WMPI_CAST
2904 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); 2904 media_player->SetMediaPlayerManager(GetMediaPlayerManager());
2905 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); 2905 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor());
2906 media_player->SetUseFallbackPath(use_fallback_path); 2906 media_player->SetUseFallbackPath(use_fallback_path);
2907 #endif // defined(OS_ANDROID) 2907 #endif // defined(OS_ANDROID)
2908 2908
2909 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) 2909 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
2910 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind(
2911 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr()));
2912 remoting_controller_ptr->SetRemoteSinkAvailableChangedCallback(base::Bind(
2913 &media::WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring,
2914 media_player->AsWeakPtr()));
2915 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind( 2910 remoting_controller_ptr->SetDownloadPosterCallback(base::Bind(
2916 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr())); 2911 &SingleImageDownloader::DownloadImage, weak_factory_.GetWeakPtr()));
2917 #endif 2912 #endif
2918 return media_player; 2913 return media_player;
2919 } 2914 }
2920 2915
2921 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2916 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2922 blink::WebApplicationCacheHostClient* client) { 2917 blink::WebApplicationCacheHostClient* client) {
2923 if (!frame_ || !frame_->view()) 2918 if (!frame_ || !frame_->view())
2924 return NULL; 2919 return NULL;
(...skipping 3898 matching lines...) Expand 10 before | Expand all | Expand 10 after
6823 // event target. Potentially a Pepper plugin will receive the event. 6818 // event target. Potentially a Pepper plugin will receive the event.
6824 // In order to tell whether a plugin gets the last mouse event and which it 6819 // In order to tell whether a plugin gets the last mouse event and which it
6825 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6820 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6826 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6821 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6827 // |pepper_last_mouse_event_target_|. 6822 // |pepper_last_mouse_event_target_|.
6828 pepper_last_mouse_event_target_ = nullptr; 6823 pepper_last_mouse_event_target_ = nullptr;
6829 #endif 6824 #endif
6830 } 6825 }
6831 6826
6832 } // namespace content 6827 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/media_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698