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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 7765013: Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/
Patch Set: Created 9 years, 4 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
« no previous file with comments | « no previous file | content/renderer/gpu/renderer_gl_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_command_buffer_stub.cc
===================================================================
--- content/common/gpu/gpu_command_buffer_stub.cc (revision 98533)
+++ content/common/gpu/gpu_command_buffer_stub.cc (working copy)
@@ -56,13 +56,10 @@
parent_texture_for_initialization_(0),
watchdog_(watchdog),
task_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
- if (share_group) {
+ if (share_group)
context_group_ = share_group->context_group_;
- } else {
- // TODO(gman): this needs to be false for everything but Pepper.
- bool bind_generates_resource = true;
- context_group_ = new gpu::gles2::ContextGroup(bind_generates_resource);
- }
+ else
+ context_group_ = new gpu::gles2::ContextGroup;
}
GpuCommandBufferStub::~GpuCommandBufferStub() {
« no previous file with comments | « no previous file | content/renderer/gpu/renderer_gl_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698