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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2840983002: Fixes -Wsometimes-uninitialized introduced in r70d2a00. (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5aead0f6ac08e24b1cd4912a879c6a01cc829075..62443c842da348ac7b9f57d7972f4a6248bd6140 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2899,7 +2899,7 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
#endif // defined(OS_ANDROID)
std::unique_ptr<media::RendererFactory> media_renderer_factory;
- media::RendererFactorySelector::FactoryType factory_type;
+ auto factory_type = media::RendererFactorySelector::FactoryType::DEFAULT;
if (use_fallback_path) {
#if defined(OS_ANDROID)
auto mojo_renderer_factory = base::MakeUnique<media::MojoRendererFactory>(
@@ -2913,13 +2913,8 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
render_thread->EnableStreamTextureCopy(),
render_thread->GetStreamTexureFactory(),
base::ThreadTaskRunnerHandle::Get()));
-#endif // defined(OS_ANDROID)
-
- // TODO(tguilbert): Move this line back into an #if defined(OS_ANDROID).
- // This will never be reached, unless we are on Android. Moving this line
- // outside of the #if/#endif block fixes a "sometimes-uninitialized" error
- // on desktop. This will be fixed with the next CL for crbug.com/663503.
factory_type = media::RendererFactorySelector::FactoryType::MEDIA_PLAYER;
+#endif // defined(OS_ANDROID)
} else {
#if defined(ENABLE_MOJO_RENDERER)
#if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698