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

Side by Side Diff: content/renderer/gpu/mailbox_output_surface.cc

Issue 1336733002: Re-land: cc: Implement shared worker contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove bad ChildProcess::current() call Created 5 years, 3 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 (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 #include "content/renderer/gpu/mailbox_output_surface.h" 5 #include "content/renderer/gpu/mailbox_output_surface.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_ack.h" 9 #include "cc/output/compositor_frame_ack.h"
10 #include "cc/output/gl_frame_data.h" 10 #include "cc/output/gl_frame_data.h"
(...skipping 27 matching lines...) Expand all
38 swap_frame_message_queue, 38 swap_frame_message_queue,
39 true), 39 true),
40 fbo_(0), 40 fbo_(0),
41 is_backbuffer_discarded_(false), 41 is_backbuffer_discarded_(false),
42 format_(format) { 42 format_(format) {
43 pending_textures_.push_back(TransferableFrame()); 43 pending_textures_.push_back(TransferableFrame());
44 capabilities_.uses_default_gl_framebuffer = false; 44 capabilities_.uses_default_gl_framebuffer = false;
45 } 45 }
46 46
47 MailboxOutputSurface::~MailboxOutputSurface() { 47 MailboxOutputSurface::~MailboxOutputSurface() {
48 }
49
50 void MailboxOutputSurface::DetachFromClient() {
48 DiscardBackbuffer(); 51 DiscardBackbuffer();
49 while (!pending_textures_.empty()) { 52 while (!pending_textures_.empty()) {
50 if (pending_textures_.front().texture_id) { 53 if (pending_textures_.front().texture_id) {
51 context_provider_->ContextGL()->DeleteTextures( 54 context_provider_->ContextGL()->DeleteTextures(
52 1, &pending_textures_.front().texture_id); 55 1, &pending_textures_.front().texture_id);
53 } 56 }
54 pending_textures_.pop_front(); 57 pending_textures_.pop_front();
55 } 58 }
59 cc::OutputSurface::DetachFromClient();
56 } 60 }
57 61
58 void MailboxOutputSurface::EnsureBackbuffer() { 62 void MailboxOutputSurface::EnsureBackbuffer() {
59 is_backbuffer_discarded_ = false; 63 is_backbuffer_discarded_ = false;
60 64
61 GLES2Interface* gl = context_provider_->ContextGL(); 65 GLES2Interface* gl = context_provider_->ContextGL();
62 66
63 if (!current_backing_.texture_id) { 67 if (!current_backing_.texture_id) {
64 // Find a texture of matching size to recycle. 68 // Find a texture of matching size to recycle.
65 while (!returned_textures_.empty()) { 69 while (!returned_textures_.empty()) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 pending_textures_.push_back(current_backing_); 215 pending_textures_.push_back(current_backing_);
212 current_backing_ = TransferableFrame(); 216 current_backing_ = TransferableFrame();
213 } 217 }
214 218
215 size_t MailboxOutputSurface::GetNumAcksPending() { 219 size_t MailboxOutputSurface::GetNumAcksPending() {
216 DCHECK(pending_textures_.size()); 220 DCHECK(pending_textures_.size());
217 return pending_textures_.size() - 1; 221 return pending_textures_.size() - 1;
218 } 222 }
219 223
220 } // namespace content 224 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698