OLD | NEW |
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 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2529 new media::MojoRendererFactory(GetMediaInterfaceProvider())); | 2529 new media::MojoRendererFactory(GetMediaInterfaceProvider())); |
2530 #else | 2530 #else |
2531 std::unique_ptr<media::RendererFactory> media_renderer_factory = | 2531 std::unique_ptr<media::RendererFactory> media_renderer_factory = |
2532 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2532 GetContentClient()->renderer()->CreateMediaRendererFactory( |
2533 this, render_thread->GetGpuFactories(), media_log); | 2533 this, render_thread->GetGpuFactories(), media_log); |
2534 | 2534 |
2535 if (!media_renderer_factory.get()) { | 2535 if (!media_renderer_factory.get()) { |
2536 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2536 media_renderer_factory.reset(new media::DefaultRendererFactory( |
2537 media_log, GetDecoderFactory(), | 2537 media_log, GetDecoderFactory(), |
2538 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2538 base::Bind(&RenderThreadImpl::GetGpuFactories, |
2539 base::Unretained(render_thread)), | 2539 base::Unretained(render_thread)))); |
2540 *render_thread->GetAudioHardwareConfig())); | |
2541 } | 2540 } |
2542 #endif // defined(ENABLE_MOJO_RENDERER) | 2541 #endif // defined(ENABLE_MOJO_RENDERER) |
2543 | 2542 |
2544 if (!url_index_.get() || url_index_->frame() != frame_) | 2543 if (!url_index_.get() || url_index_->frame() != frame_) |
2545 url_index_.reset(new media::UrlIndex(frame_)); | 2544 url_index_.reset(new media::UrlIndex(frame_)); |
2546 | 2545 |
2547 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2546 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
2548 frame_, client, encrypted_client, | 2547 frame_, client, encrypted_client, |
2549 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2548 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
2550 std::move(media_renderer_factory), url_index_, params); | 2549 std::move(media_renderer_factory), url_index_, params); |
(...skipping 3585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6136 // event target. Potentially a Pepper plugin will receive the event. | 6135 // event target. Potentially a Pepper plugin will receive the event. |
6137 // In order to tell whether a plugin gets the last mouse event and which it | 6136 // In order to tell whether a plugin gets the last mouse event and which it |
6138 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6137 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6139 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6138 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6140 // |pepper_last_mouse_event_target_|. | 6139 // |pepper_last_mouse_event_target_|. |
6141 pepper_last_mouse_event_target_ = nullptr; | 6140 pepper_last_mouse_event_target_ = nullptr; |
6142 #endif | 6141 #endif |
6143 } | 6142 } |
6144 | 6143 |
6145 } // namespace content | 6144 } // namespace content |
OLD | NEW |