content/renderer/render_frame_impl.cc - Issue 890873007: Cleanup: Move ContextProviderWebContext into cc/blink.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 890873007: Cleanup: Move ContextProviderWebContext into cc/blink. (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

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 7942a077c39b343e2bc8b5b3d5193d6e8bf1da4e..c795f57f828dd5a62135fdc0500a457dd4f1b853 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -157,7 +157,7 @@

#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"

+#include "cc/blink/context_provider_web_context.h"

#endif

#if defined(ENABLE_PEPPER_CDMS)

@@ -4435,7 +4435,7 @@ WebMediaPlayer* RenderFrameImpl::CreateAndroidWebMediaPlayer(

SynchronousCompositorFactory::GetInstance()) {

stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_);

} else {

- scoped_refptr<webkit::gpu::ContextProviderWebContext> context_provider =

+ scoped_refptr<cc_blink::ContextProviderWebContext> context_provider =

RenderThreadImpl::current()->SharedMainThreadContextProvider();

if (!context_provider.get()) {

« no previous file with comments | « content/renderer/pepper/video_decoder_shim.cc ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »