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

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

Issue 2325733002: media: Remove CreateMediaRendererFactory() (Closed)
Patch Set: Created 4 years, 3 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 | « content/public/renderer/content_renderer_client.cc ('k') | no next file » | 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 2615 matching lines...) Expand 10 before | Expand all | Expand 10 after
2626 } 2626 }
2627 #endif // defined(OS_ANDROID) 2627 #endif // defined(OS_ANDROID)
2628 2628
2629 #if defined(ENABLE_MOJO_RENDERER) 2629 #if defined(ENABLE_MOJO_RENDERER)
2630 std::unique_ptr<media::RendererFactory> media_renderer_factory( 2630 std::unique_ptr<media::RendererFactory> media_renderer_factory(
2631 new media::MojoRendererFactory( 2631 new media::MojoRendererFactory(
2632 base::Bind(&RenderThreadImpl::GetGpuFactories, 2632 base::Bind(&RenderThreadImpl::GetGpuFactories,
2633 base::Unretained(render_thread)), 2633 base::Unretained(render_thread)),
2634 GetMediaInterfaceProvider())); 2634 GetMediaInterfaceProvider()));
2635 #else 2635 #else
2636 std::unique_ptr<media::RendererFactory> media_renderer_factory = 2636 std::unique_ptr<media::RendererFactory> media_renderer_factory(
2637 GetContentClient()->renderer()->CreateMediaRendererFactory( 2637 new media::DefaultRendererFactory(
2638 this, render_thread->GetGpuFactories(), media_log); 2638 media_log, GetDecoderFactory(),
2639 2639 base::Bind(&RenderThreadImpl::GetGpuFactories,
2640 if (!media_renderer_factory.get()) { 2640 base::Unretained(render_thread))));
2641 media_renderer_factory.reset(new media::DefaultRendererFactory(
2642 media_log, GetDecoderFactory(),
2643 base::Bind(&RenderThreadImpl::GetGpuFactories,
2644 base::Unretained(render_thread))));
2645 }
2646 #endif // defined(ENABLE_MOJO_RENDERER) 2641 #endif // defined(ENABLE_MOJO_RENDERER)
2647 2642
2648 if (!url_index_.get() || url_index_->frame() != frame_) 2643 if (!url_index_.get() || url_index_->frame() != frame_)
2649 url_index_.reset(new media::UrlIndex(frame_)); 2644 url_index_.reset(new media::UrlIndex(frame_));
2650 2645
2651 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( 2646 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl(
2652 frame_, client, encrypted_client, 2647 frame_, client, encrypted_client,
2653 GetWebMediaPlayerDelegate()->AsWeakPtr(), 2648 GetWebMediaPlayerDelegate()->AsWeakPtr(),
2654 std::move(media_renderer_factory), url_index_, params); 2649 std::move(media_renderer_factory), url_index_, params);
2655 2650
(...skipping 3694 matching lines...) Expand 10 before | Expand all | Expand 10 after
6350 // event target. Potentially a Pepper plugin will receive the event. 6345 // event target. Potentially a Pepper plugin will receive the event.
6351 // In order to tell whether a plugin gets the last mouse event and which it 6346 // In order to tell whether a plugin gets the last mouse event and which it
6352 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6347 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6353 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6348 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6354 // |pepper_last_mouse_event_target_|. 6349 // |pepper_last_mouse_event_target_|.
6355 pepper_last_mouse_event_target_ = nullptr; 6350 pepper_last_mouse_event_target_ = nullptr;
6356 #endif 6351 #endif
6357 } 6352 }
6358 6353
6359 } // namespace content 6354 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698