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

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

Issue 10534173: GPU Program Caching (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
index 7de1375e72544e4d7dcfdb487fc0dc3b2faf3404..db02830bd2002b398ef43877a0402eb3d7e9d816 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <string>
+#include "base/memory/weak_ptr.h"
#include "base/string_number_conversions.h"
#include "gpu/command_buffer/common/gl_mock.h"
#include "gpu/command_buffer/common/gles2_cmd_format.h"
@@ -32,6 +33,8 @@ using ::testing::StrEq;
using ::testing::StrictMock;
namespace gpu {
+class ShaderCache;
+
namespace gles2 {
GLES2DecoderTestBase::GLES2DecoderTestBase()
@@ -83,7 +86,9 @@ void GLES2DecoderTestBase::InitDecoder(
bool bind_generates_resource) {
gl_.reset(new StrictMock<MockGLInterface>());
::gfx::GLInterface::SetGLInterface(gl_.get());
- group_ = ContextGroup::Ref(new ContextGroup(NULL, bind_generates_resource));
+ group_ = ContextGroup::Ref(new ContextGroup(NULL,
+ bind_generates_resource,
+ base::WeakPtr<ShaderCache>()));
InSequence sequence;

Powered by Google App Engine
This is Rietveld 408576698