content/child/child_thread_impl_browsertest.cc - Issue 1291643002: Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx

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/child/child_thread_impl_browsertest.cc

Issue 1291643002: Revert of Move NumberOfPlanesForGpuMemoryBufferFormat to gfx (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/browser/renderer_host/media/video_capture_buffer_pool.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/child_thread_impl_browsertest.cc

diff --git a/content/child/child_thread_impl_browsertest.cc b/content/child/child_thread_impl_browsertest.cc

index add820cefe96b0d5eccc665a4f3b58228aa2b748..d6b82a80af4c24023e061d8b1108dd637329c333 100644

--- a/content/child/child_thread_impl_browsertest.cc

+++ b/content/child/child_thread_impl_browsertest.cc

@@ -16,7 +16,6 @@

#include "content/public/test/content_browser_test.h"

#include "content/public/test/content_browser_test_utils.h"

#include "content/shell/browser/shell.h"

-#include "ui/gfx/buffer_format_util.h"

#include "url/gurl.h"

namespace content {

@@ -158,7 +157,8 @@

ASSERT_TRUE(buffer);

EXPECT_EQ(format, buffer->GetFormat());

- size_t num_planes = gfx::NumberOfPlanesForBufferFormat(format);

+ size_t num_planes =

+ GpuMemoryBufferImpl::NumberOfPlanesForGpuMemoryBufferFormat(format);

// Map buffer planes.

scoped_ptr<void* []> planes(new void* [num_planes]);