OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/aura/owned_mailbox.h" | 5 #include "content/browser/aura/owned_mailbox.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/aura/image_transport_factory.h" | 8 #include "content/browser/aura/image_transport_factory.h" |
9 #include "content/common/gpu/client/gl_helper.h" | 9 #include "content/common/gpu/client/gl_helper.h" |
10 | 10 |
11 namespace content { | 11 namespace content { |
12 | 12 |
13 OwnedMailbox::OwnedMailbox(GLHelper* gl_helper) | 13 OwnedMailbox::OwnedMailbox(GLHelper* gl_helper) |
14 : texture_id_(0), sync_point_(0), gl_helper_(gl_helper) { | 14 : texture_id_(0), gl_helper_(gl_helper) { |
15 texture_id_ = gl_helper_->CreateTexture(); | 15 texture_id_ = gl_helper_->CreateTexture(); |
16 mailbox_ = gl_helper_->ProduceMailboxFromTexture(texture_id_, &sync_point_); | 16 mailbox_holder_ = gl_helper_->ProduceMailboxHolderFromTexture(texture_id_); |
17 ImageTransportFactory::GetInstance()->AddObserver(this); | 17 ImageTransportFactory::GetInstance()->AddObserver(this); |
18 } | 18 } |
19 | 19 |
20 OwnedMailbox::~OwnedMailbox() { | 20 OwnedMailbox::~OwnedMailbox() { |
21 ImageTransportFactory::GetInstance()->RemoveObserver(this); | 21 ImageTransportFactory::GetInstance()->RemoveObserver(this); |
22 if (gl_helper_) { | 22 if (gl_helper_) { |
23 gl_helper_->WaitSyncPoint(sync_point_); | 23 gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point); |
24 gl_helper_->DeleteTexture(texture_id_); | 24 gl_helper_->DeleteTexture(texture_id_); |
25 } | 25 } |
26 } | 26 } |
27 | 27 |
28 void OwnedMailbox::UpdateSyncPoint(uint32 sync_point) { | 28 void OwnedMailbox::set_sync_point(uint32 sync_point) { |
danakj
2014/01/06 20:13:42
keep the old method name, set_sync_point implies a
sheu
2014/01/06 22:44:44
Done.
| |
29 if (sync_point) | 29 if (sync_point) |
30 sync_point_ = sync_point; | 30 mailbox_holder_.sync_point = sync_point; |
31 } | 31 } |
32 | 32 |
33 void OwnedMailbox::OnLostResources() { | 33 void OwnedMailbox::OnLostResources() { |
34 gl_helper_->WaitSyncPoint(sync_point_); | 34 gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point); |
35 gl_helper_->DeleteTexture(texture_id_); | 35 gl_helper_->DeleteTexture(texture_id_); |
36 texture_id_ = 0; | 36 texture_id_ = 0; |
37 mailbox_ = gpu::Mailbox(); | 37 mailbox_holder_ = gpu::MailboxHolder(); |
38 sync_point_ = 0; | |
39 gl_helper_ = NULL; | 38 gl_helper_ = NULL; |
40 } | 39 } |
41 | 40 |
42 } // namespace content | 41 } // namespace content |
OLD | NEW |