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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 818853004: Revert of media: Optimize HW Video to 2D Canvas copy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « content/renderer/media/webmediaplayer_ms.cc ('k') | media/BUILD.gn » ('j') | 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 547e263e99138433c77c5305c2be9e2a10d3482b..0ac71eeed443e1e4c3b300b6601a2f76d394da0d 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -153,8 +153,6 @@
#include "content/renderer/media/android/renderer_media_player_manager.h"
#include "content/renderer/media/android/stream_texture_factory_impl.h"
#include "content/renderer/media/android/webmediaplayer_android.h"
-#else
-#include "webkit/common/gpu/context_provider_web_context.h"
#endif
#if defined(ENABLE_PEPPER_CDMS)
@@ -475,16 +473,6 @@
params.transition = extra_data->transition_type();
return params;
}
-
-#if !defined(OS_ANDROID)
-media::Context3D GetSharedMainThreadContext3D() {
- cc::ContextProvider* provider =
- RenderThreadImpl::current()->SharedMainThreadContextProvider().get();
- if (!provider)
- return media::Context3D();
- return media::Context3D(provider->ContextGL(), provider->GrContext());
-}
-#endif
RenderFrameImpl::CreateRenderFrameImplFunction g_create_render_frame_impl =
nullptr;
@@ -1814,8 +1802,7 @@
render_thread->GetAudioRendererMixerManager()->CreateInput(
render_view_->routing_id_, routing_id_),
media_log, render_thread->GetMediaThreadTaskRunner(),
- render_thread->compositor_message_loop_proxy(),
- base::Bind(&GetSharedMainThreadContext3D), initial_cdm);
+ render_thread->compositor_message_loop_proxy(), initial_cdm);
#if defined(ENABLE_PEPPER_CDMS)
scoped_ptr<media::CdmFactory> cdm_factory(
« no previous file with comments | « content/renderer/media/webmediaplayer_ms.cc ('k') | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698