| 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 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2548 GetMediaInterfaceProvider())); | 2548 GetMediaInterfaceProvider())); |
| 2549 #else | 2549 #else |
| 2550 std::unique_ptr<media::RendererFactory> media_renderer_factory = | 2550 std::unique_ptr<media::RendererFactory> media_renderer_factory = |
| 2551 GetContentClient()->renderer()->CreateMediaRendererFactory( | 2551 GetContentClient()->renderer()->CreateMediaRendererFactory( |
| 2552 this, render_thread->GetGpuFactories(), media_log); | 2552 this, render_thread->GetGpuFactories(), media_log); |
| 2553 | 2553 |
| 2554 if (!media_renderer_factory.get()) { | 2554 if (!media_renderer_factory.get()) { |
| 2555 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2555 media_renderer_factory.reset(new media::DefaultRendererFactory( |
| 2556 media_log, GetDecoderFactory(), | 2556 media_log, GetDecoderFactory(), |
| 2557 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2557 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2558 base::Unretained(render_thread)), | 2558 base::Unretained(render_thread)))); |
| 2559 *render_thread->GetAudioHardwareConfig())); | |
| 2560 } | 2559 } |
| 2561 #endif // defined(ENABLE_MOJO_RENDERER) | 2560 #endif // defined(ENABLE_MOJO_RENDERER) |
| 2562 | 2561 |
| 2563 if (!url_index_.get() || url_index_->frame() != frame_) | 2562 if (!url_index_.get() || url_index_->frame() != frame_) |
| 2564 url_index_.reset(new media::UrlIndex(frame_)); | 2563 url_index_.reset(new media::UrlIndex(frame_)); |
| 2565 | 2564 |
| 2566 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2565 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2567 frame_, client, encrypted_client, | 2566 frame_, client, encrypted_client, |
| 2568 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2567 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 2569 std::move(media_renderer_factory), url_index_, params); | 2568 std::move(media_renderer_factory), url_index_, params); |
| (...skipping 3587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |