content/common/gpu/client/context_provider_command_buffer.cc - Issue 1102673007: content: Move the remaining source files of webkit/ over here.

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 1102673007: content: Move the remaining source files of webkit/ over here. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: REBASE Created 5 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 | « content/common/gpu/client/context_provider_command_buffer.h ('k') | content/common/gpu/client/grcontext_for_webgraphicscontext3d.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 8bfdc09adda5cb4149fc68585047518d01165839..eb7096499b2d23d29552e8c61b652968f97e7267 100644

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

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

@@ -10,9 +10,9 @@

#include "base/callback_helpers.h"

#include "base/strings/stringprintf.h"

#include "cc/output/managed_memory_policy.h"

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

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

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

-#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h"

namespace content {

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

if (gr_context_)

return gr_context_->get();

- gr_context_.reset(

- new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get()));

+ gr_context_.reset(new GrContextForWebGraphicsContext3D(context3d_.get()));

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

if (IsContextLost())