content/common/gpu/client/context_provider_command_buffer.cc - Issue 1880823004: Move skia related files from content/common/gpu/client to gpu/skia_bindings.

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/common/gpu/client/context_provider_command_buffer.cc

Issue 1880823004: Move skia related files from content/common/gpu/client to gpu/skia_bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update 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/browser/android/in_process/context_provider_in_process.cc ('K') | « content/common/gpu/client/context_provider_command_buffer.h ('k') | content/common/gpu/client/grcontext_for_gles2_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/context_provider_command_buffer.cc

diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc

index 57e862a85f1678b262f83a51cc0096e3ad8bf630..c3ff9331621103fe098e0c28f1287b9219747c98 100644

--- a/content/common/gpu/client/context_provider_command_buffer.cc

+++ b/content/common/gpu/client/context_provider_command_buffer.cc

@@ -12,8 +12,8 @@

#include "base/callback_helpers.h"

#include "base/strings/stringprintf.h"

#include "cc/output/managed_memory_policy.h"

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

#include "gpu/command_buffer/client/gles2_implementation.h"

+#include "gpu/skia_bindings/grcontext_for_gles2_interface.h"

#include "third_party/skia/include/gpu/GrContext.h"

namespace content {

@@ -126,8 +126,8 @@ class GrContext* ContextProviderCommandBuffer::GrContext() {

if (gr_context_)

return gr_context_->get();

- gr_context_.reset(

- new GrContextForGLES2Interface(context3d_->GetGLInterface()));

+ gr_context_.reset(new skia_bindings::GrContextForGLES2Interface(

+ context3d_->GetGLInterface()));

// If GlContext is already lost, also abandon the new GrContext.

if (gr_context_->get() &&