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

Side by Side Diff: cc/test/test_in_process_context_provider.cc

Issue 634243003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr [part-4] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formating fix. Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/test_in_process_context_provider.h" 5 #include "cc/test/test_in_process_context_provider.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "gpu/GLES2/gl2extchromium.h" 8 #include "gpu/GLES2/gl2extchromium.h"
9 #include "gpu/command_buffer/client/gl_in_process_context.h" 9 #include "gpu/command_buffer/client/gl_in_process_context.h"
10 #include "gpu/command_buffer/client/gles2_implementation.h" 10 #include "gpu/command_buffer/client/gles2_implementation.h"
(...skipping 20 matching lines...) Expand all
31 attribs.depth_size = 24; 31 attribs.depth_size = 24;
32 attribs.stencil_size = 8; 32 attribs.stencil_size = 8;
33 attribs.samples = 0; 33 attribs.samples = 0;
34 attribs.sample_buffers = 0; 34 attribs.sample_buffers = 0;
35 attribs.fail_if_major_perf_caveat = false; 35 attribs.fail_if_major_perf_caveat = false;
36 attribs.bind_generates_resource = false; 36 attribs.bind_generates_resource = false;
37 gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; 37 gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu;
38 38
39 scoped_ptr<gpu::GLInProcessContext> context = 39 scoped_ptr<gpu::GLInProcessContext> context =
40 make_scoped_ptr(gpu::GLInProcessContext::Create( 40 make_scoped_ptr(gpu::GLInProcessContext::Create(
41 NULL, 41 nullptr,
42 NULL, 42 nullptr,
43 is_offscreen, 43 is_offscreen,
44 gfx::kNullAcceleratedWidget, 44 gfx::kNullAcceleratedWidget,
45 gfx::Size(1, 1), 45 gfx::Size(1, 1),
46 NULL, 46 nullptr,
47 share_resources, 47 share_resources,
48 attribs, 48 attribs,
49 gpu_preference, 49 gpu_preference,
50 gpu::GLInProcessContextSharedMemoryLimits())); 50 gpu::GLInProcessContextSharedMemoryLimits()));
51 51
52 DCHECK(context); 52 DCHECK(context);
53 return context.Pass(); 53 return context.Pass();
54 } 54 }
55 55
56 TestInProcessContextProvider::TestInProcessContextProvider() 56 TestInProcessContextProvider::TestInProcessContextProvider()
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 bool TestInProcessContextProvider::DestroyedOnMainThread() { return false; } 131 bool TestInProcessContextProvider::DestroyedOnMainThread() { return false; }
132 132
133 void TestInProcessContextProvider::SetLostContextCallback( 133 void TestInProcessContextProvider::SetLostContextCallback(
134 const LostContextCallback& lost_context_callback) {} 134 const LostContextCallback& lost_context_callback) {}
135 135
136 void TestInProcessContextProvider::SetMemoryPolicyChangedCallback( 136 void TestInProcessContextProvider::SetMemoryPolicyChangedCallback(
137 const MemoryPolicyChangedCallback& memory_policy_changed_callback) {} 137 const MemoryPolicyChangedCallback& memory_policy_changed_callback) {}
138 138
139 } // namespace cc 139 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698