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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

Issue 196633009: Use CheckedNumerics in AsyncPixelTransfersCompletedQuery, add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 6 years, 9 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: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index f8aea41d0887491fbf1cce22fe4b5ec01007578d..16abb411960c95889c741f62bc95337d7ef88059 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -171,6 +171,8 @@ class GLES2DecoderTestBase : public testing::Test {
bool bind_generates_resource,
const CommandLine* command_line);
+ void ResetDecoder();
+
const ContextGroup& group() const {
return *group_.get();
}
@@ -518,7 +520,7 @@ class GLES2DecoderTestBase : public testing::Test {
virtual gpu::Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE;
void ClearSharedMemory() {
- memset(data_.get(), kInitialMemoryValue, kSharedBufferSize);
+ memset(shm_->memory(), kInitialMemoryValue, kSharedBufferSize);
}
virtual void set_token(int32 token) OVERRIDE;
@@ -532,7 +534,7 @@ class GLES2DecoderTestBase : public testing::Test {
virtual int32 GetGetOffset() OVERRIDE;
private:
- scoped_ptr<int8[]> data_;
+ scoped_ptr<base::SharedMemory> shm_;
gpu::Buffer valid_buffer_;
gpu::Buffer invalid_buffer_;
};

Powered by Google App Engine
This is Rietveld 408576698