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

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

Issue 1942803002: Caching AudioOutputDevice instances in mixer manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, fix for sleep() compile error on win and a bit of cleanup around timeouts. Created 4 years, 7 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
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 2492 matching lines...) Expand 10 before | Expand all | Expand 10 after
2503 new media::MojoRendererFactory(GetMediaInterfaceProvider())); 2503 new media::MojoRendererFactory(GetMediaInterfaceProvider()));
2504 #else 2504 #else
2505 std::unique_ptr<media::RendererFactory> media_renderer_factory = 2505 std::unique_ptr<media::RendererFactory> media_renderer_factory =
2506 GetContentClient()->renderer()->CreateMediaRendererFactory( 2506 GetContentClient()->renderer()->CreateMediaRendererFactory(
2507 this, render_thread->GetGpuFactories(), media_log); 2507 this, render_thread->GetGpuFactories(), media_log);
2508 2508
2509 if (!media_renderer_factory.get()) { 2509 if (!media_renderer_factory.get()) {
2510 media_renderer_factory.reset(new media::DefaultRendererFactory( 2510 media_renderer_factory.reset(new media::DefaultRendererFactory(
2511 media_log, GetDecoderFactory(), 2511 media_log, GetDecoderFactory(),
2512 base::Bind(&RenderThreadImpl::GetGpuFactories, 2512 base::Bind(&RenderThreadImpl::GetGpuFactories,
2513 base::Unretained(render_thread)), 2513 base::Unretained(render_thread))));
2514 *render_thread->GetAudioHardwareConfig()));
2515 } 2514 }
2516 #endif // defined(ENABLE_MOJO_RENDERER) 2515 #endif // defined(ENABLE_MOJO_RENDERER)
2517 2516
2518 if (!url_index_.get() || url_index_->frame() != frame_) 2517 if (!url_index_.get() || url_index_->frame() != frame_)
2519 url_index_.reset(new media::UrlIndex(frame_)); 2518 url_index_.reset(new media::UrlIndex(frame_));
2520 2519
2521 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2520 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2522 frame_, client, encrypted_client, 2521 frame_, client, encrypted_client,
2523 GetWebMediaPlayerDelegate()->AsWeakPtr(), 2522 GetWebMediaPlayerDelegate()->AsWeakPtr(),
2524 std::move(media_renderer_factory), url_index_, params); 2523 std::move(media_renderer_factory), url_index_, params);
(...skipping 3523 matching lines...) Expand 10 before | Expand all | Expand 10 after
6048 int match_count, 6047 int match_count,
6049 int ordinal, 6048 int ordinal,
6050 const WebRect& selection_rect, 6049 const WebRect& selection_rect,
6051 bool final_status_update) { 6050 bool final_status_update) {
6052 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6051 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6053 selection_rect, ordinal, 6052 selection_rect, ordinal,
6054 final_status_update)); 6053 final_status_update));
6055 } 6054 }
6056 6055
6057 } // namespace content 6056 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698