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

Side by Side Diff: cc/test/test_web_graphics_context_3d.h

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 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 5 #ifndef CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
6 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 6 #define CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 } 280 }
281 281
282 void set_context_lost(bool context_lost) { context_lost_ = context_lost; } 282 void set_context_lost(bool context_lost) { context_lost_ = context_lost; }
283 void set_times_bind_texture_succeeds(int times) { 283 void set_times_bind_texture_succeeds(int times) {
284 times_bind_texture_succeeds_ = times; 284 times_bind_texture_succeeds_ = times;
285 } 285 }
286 void set_times_end_query_succeeds(int times) { 286 void set_times_end_query_succeeds(int times) {
287 times_end_query_succeeds_ = times; 287 times_end_query_succeeds_ = times;
288 } 288 }
289 289
290 // When set, mapImageCHROMIUM and mapBufferCHROMIUM will return NULL after 290 // When set, mapImageCHROMIUM and mapBufferCHROMIUM will return nullptr after
danakj 2014/10/10 17:27:35 just use null in comments
291 // this many times. 291 // this many times.
292 void set_times_map_image_chromium_succeeds(int times) { 292 void set_times_map_image_chromium_succeeds(int times) {
293 times_map_image_chromium_succeeds_ = times; 293 times_map_image_chromium_succeeds_ = times;
294 } 294 }
295 void set_times_map_buffer_chromium_succeeds(int times) { 295 void set_times_map_buffer_chromium_succeeds(int times) {
296 times_map_buffer_chromium_succeeds_ = times; 296 times_map_buffer_chromium_succeeds_ = times;
297 } 297 }
298 298
299 size_t NumTextures() const; 299 size_t NumTextures() const;
300 GLuint TextureAt(int i) const; 300 GLuint TextureAt(int i) const;
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
470 470
471 scoped_refptr<Namespace> namespace_; 471 scoped_refptr<Namespace> namespace_;
472 static Namespace* shared_namespace_; 472 static Namespace* shared_namespace_;
473 473
474 base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_; 474 base::WeakPtrFactory<TestWebGraphicsContext3D> weak_ptr_factory_;
475 }; 475 };
476 476
477 } // namespace cc 477 } // namespace cc
478 478
479 #endif // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_ 479 #endif // CC_TEST_TEST_WEB_GRAPHICS_CONTEXT_3D_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698