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: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

Issue 13454036: Rewrite scoped_array<T> to scoped_ptr<T[]> in gpu/, Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Yikes Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
7 7
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/buffer_manager.h" 10 #include "gpu/command_buffer/service/buffer_manager.h"
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 512
513 virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) OVERRIDE; 513 virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) OVERRIDE;
514 514
515 // Overridden from CommandBufferEngine. 515 // Overridden from CommandBufferEngine.
516 virtual bool SetGetOffset(int32 offset) OVERRIDE; 516 virtual bool SetGetOffset(int32 offset) OVERRIDE;
517 517
518 // Overridden from CommandBufferEngine. 518 // Overridden from CommandBufferEngine.
519 virtual int32 GetGetOffset() OVERRIDE; 519 virtual int32 GetGetOffset() OVERRIDE;
520 520
521 private: 521 private:
522 scoped_array<int8> data_; 522 scoped_ptr<int8[]> data_;
523 gpu::Buffer valid_buffer_; 523 gpu::Buffer valid_buffer_;
524 gpu::Buffer invalid_buffer_; 524 gpu::Buffer invalid_buffer_;
525 }; 525 };
526 526
527 void AddExpectationsForVertexAttribManager(); 527 void AddExpectationsForVertexAttribManager();
528 528
529 scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_; 529 scoped_ptr< ::testing::StrictMock<MockCommandBufferEngine> > engine_;
530 scoped_refptr<ContextGroup> group_; 530 scoped_refptr<ContextGroup> group_;
531 }; 531 };
532 532
533 class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase { 533 class GLES2DecoderWithShaderTestBase : public GLES2DecoderTestBase {
534 public: 534 public:
535 GLES2DecoderWithShaderTestBase() 535 GLES2DecoderWithShaderTestBase()
536 : GLES2DecoderTestBase() { 536 : GLES2DecoderTestBase() {
537 } 537 }
538 538
539 protected: 539 protected:
540 virtual void SetUp() OVERRIDE; 540 virtual void SetUp() OVERRIDE;
541 virtual void TearDown() OVERRIDE; 541 virtual void TearDown() OVERRIDE;
542 542
543 }; 543 };
544 544
545 } // namespace gles2 545 } // namespace gles2
546 } // namespace gpu 546 } // namespace gpu
547 547
548 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_ 548 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_UNITTEST_BASE_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/memory_program_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698