Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1315)

Unified Diff: content/browser/gpu/gpu_ipc_browsertests.cc

Issue 1900993002: Move SharedMemoryLimits out of WebGraphicsContext3DCommandBufferImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@limits
Patch Set: move-limits: types 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
Index: content/browser/gpu/gpu_ipc_browsertests.cc
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc
index 730e6a25a9ed841d2ae7d3d98a800094876be162..11d246ca90ddd0a122f81b78d32180d309879e46 100644
--- a/content/browser/gpu/gpu_ipc_browsertests.cc
+++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -43,8 +43,7 @@ std::unique_ptr<WebGraphicsContext3DCommandBufferImpl> CreateContext(
bool automatic_flushes = false;
return base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
gpu::kNullSurfaceHandle, GURL(), gpu_channel_host, attributes,
- gfx::PreferIntegratedGpu, share_resources, automatic_flushes,
- WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits(), nullptr));
+ gfx::PreferIntegratedGpu, share_resources, automatic_flushes, nullptr));
}
class ContextTestBase : public content::ContentBrowserTest {
@@ -69,7 +68,7 @@ class ContextTestBase : public content::ContentBrowserTest {
CHECK(gpu_channel_host);
provider_ = new content::ContextProviderCommandBuffer(
- CreateContext(gpu_channel_host.get()),
+ CreateContext(gpu_channel_host.get()), gpu::SharedMemoryLimits(),
content::OFFSCREEN_CONTEXT_FOR_TESTING);
bool bound = provider_->BindToCurrentThread();
CHECK(bound);
@@ -228,6 +227,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
// retain the host after provider is destroyed.
scoped_refptr<ContextProviderCommandBuffer> provider =
new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
+ gpu::SharedMemoryLimits(),
OFFSCREEN_CONTEXT_FOR_TESTING);
EXPECT_TRUE(provider->BindToCurrentThread());
@@ -276,6 +276,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGpuChannelHostFactoryTest,
scoped_refptr<ContextProviderCommandBuffer> provider =
new ContextProviderCommandBuffer(CreateContext(GetGpuChannel()),
+ gpu::SharedMemoryLimits(),
OFFSCREEN_CONTEXT_FOR_TESTING);
base::RunLoop run_loop;
int counter = 0;

Powered by Google App Engine
This is Rietveld 408576698