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

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 cache smoke test added minor unit test cleanup Created 4 years, 6 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 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 GetMediaInterfaceProvider())); 2557 GetMediaInterfaceProvider()));
2558 #else 2558 #else
2559 std::unique_ptr<media::RendererFactory> media_renderer_factory = 2559 std::unique_ptr<media::RendererFactory> media_renderer_factory =
2560 GetContentClient()->renderer()->CreateMediaRendererFactory( 2560 GetContentClient()->renderer()->CreateMediaRendererFactory(
2561 this, render_thread->GetGpuFactories(), media_log); 2561 this, render_thread->GetGpuFactories(), media_log);
2562 2562
2563 if (!media_renderer_factory.get()) { 2563 if (!media_renderer_factory.get()) {
2564 media_renderer_factory.reset(new media::DefaultRendererFactory( 2564 media_renderer_factory.reset(new media::DefaultRendererFactory(
2565 media_log, GetDecoderFactory(), 2565 media_log, GetDecoderFactory(),
2566 base::Bind(&RenderThreadImpl::GetGpuFactories, 2566 base::Bind(&RenderThreadImpl::GetGpuFactories,
2567 base::Unretained(render_thread)), 2567 base::Unretained(render_thread))));
2568 *render_thread->GetAudioHardwareConfig()));
2569 } 2568 }
2570 #endif // defined(ENABLE_MOJO_RENDERER) 2569 #endif // defined(ENABLE_MOJO_RENDERER)
2571 2570
2572 if (!url_index_.get() || url_index_->frame() != frame_) 2571 if (!url_index_.get() || url_index_->frame() != frame_)
2573 url_index_.reset(new media::UrlIndex(frame_)); 2572 url_index_.reset(new media::UrlIndex(frame_));
2574 2573
2575 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2574 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2576 frame_, client, encrypted_client, 2575 frame_, client, encrypted_client,
2577 GetWebMediaPlayerDelegate()->AsWeakPtr(), 2576 GetWebMediaPlayerDelegate()->AsWeakPtr(),
2578 std::move(media_renderer_factory), url_index_, params); 2577 std::move(media_renderer_factory), url_index_, params);
(...skipping 3578 matching lines...) Expand 10 before | Expand all | Expand 10 after
6157 // event target. Potentially a Pepper plugin will receive the event. 6156 // event target. Potentially a Pepper plugin will receive the event.
6158 // In order to tell whether a plugin gets the last mouse event and which it 6157 // In order to tell whether a plugin gets the last mouse event and which it
6159 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6158 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6160 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6159 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6161 // |pepper_last_mouse_event_target_|. 6160 // |pepper_last_mouse_event_target_|.
6162 pepper_last_mouse_event_target_ = nullptr; 6161 pepper_last_mouse_event_target_ = nullptr;
6163 #endif 6162 #endif
6164 } 6163 }
6165 6164
6166 } // namespace content 6165 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698