content/renderer/render_frame_impl.cc - Issue 1916923004: Request context sharing via content::ContextProviderCommandBuffer

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 1916923004: Request context sharing via content::ContextProviderCommandBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sharegroup: . Created 4 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

« content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc ('K') | « content/renderer/pepper/video_decoder_shim.cc ('k') | content/renderer/render_thread_impl.h » ('j') | gpu/command_buffer/client/gles2_implementation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 7a5a438053267852f63b2d2a972d5208805c0668..2b6a1682f5a3707d5f3fa2d23ef368e288224183 100644

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

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

@@ -52,6 +52,7 @@

#include "content/common/clipboard_messages.h"

#include "content/common/frame_messages.h"

#include "content/common/frame_replication_state.h"

+#include "content/common/gpu/client/context_provider_command_buffer.h"

#include "content/common/input_messages.h"

#include "content/common/navigation_params.h"

#include "content/common/page_messages.h"

@@ -201,7 +202,6 @@

#if defined(OS_ANDROID)

#include <cpu-features.h>

-#include "content/common/gpu/client/context_provider_command_buffer.h"

#include "content/renderer/java/gin_java_bridge_dispatcher.h"

#include "content/renderer/media/android/renderer_media_player_manager.h"

#include "content/renderer/media/android/renderer_media_session_manager.h"

@@ -603,7 +603,7 @@ CommonNavigationParams MakeCommonNavigationParams(

}

media::Context3D GetSharedMainThreadContext3D() {

- cc::ContextProvider* provider =

+ ContextProviderCommandBuffer* provider =

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

if (!provider)

return media::Context3D();