namespace cc {
-scoped_refptr<TextureLayer> TextureLayer::Create(TextureLayerClient* client) {
- return scoped_refptr<TextureLayer>(new TextureLayer(client, false));
-}
-
scoped_refptr<TextureLayer> TextureLayer::CreateForMailbox(
TextureLayerClient* client) {
- return scoped_refptr<TextureLayer>(new TextureLayer(client, true));
+ return scoped_refptr<TextureLayer>(new TextureLayer(client));
}
-TextureLayer::TextureLayer(TextureLayerClient* client, bool uses_mailbox)
+TextureLayer::TextureLayer(TextureLayerClient* client)
: Layer(),
client_(client),
- uses_mailbox_(uses_mailbox),
flipped_(true),
uv_top_left_(0.f, 0.f),
uv_bottom_right_(1.f, 1.f),
premultiplied_alpha_(true),
blend_background_color_(false),
rate_limit_context_(false),
- content_committed_(false),
- texture_id_(0),
needs_set_mailbox_(false) {
vertex_opacity_[0] = 1.0f;
vertex_opacity_[1] = 1.0f;
if (rate_limit_context_ && client_ && layer_tree_host())
layer_tree_host()->StopRateLimiter();
client_ = NULL;
- if (uses_mailbox_)
- SetTextureMailbox(TextureMailbox(), scoped_ptr<SingleReleaseCallback>());
- else
- SetTextureId(0);
+ ClearTexture();
+ UpdateDrawsContent(HasDrawableContent());
+}
+
+void TextureLayer::ClearTexture() {
+ SetTextureMailbox(TextureMailbox(), scoped_ptr<SingleReleaseCallback>());
}
scoped_ptr<LayerImpl> TextureLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
- return TextureLayerImpl::Create(tree_impl, id(), uses_mailbox_).
- PassAs<LayerImpl>();
+ return TextureLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
}
void TextureLayer::SetFlipped(bool flipped) {
rate_limit_context_ = rate_limit;
}
-void TextureLayer::SetTextureId(unsigned id) {
- DCHECK(!uses_mailbox_);
- if (texture_id_ == id)
- return;
- if (texture_id_ && layer_tree_host())
- layer_tree_host()->AcquireLayerTextures();
- texture_id_ = id;
- SetNeedsCommit();
- // The texture id needs to be removed from the active tree before the
- // commit is called complete.
- SetNextCommitWaitsForActivation();
-}
-
void TextureLayer::SetTextureMailboxInternal(
const TextureMailbox& mailbox,
scoped_ptr<SingleReleaseCallback> release_callback,
- bool requires_commit) {
- DCHECK(uses_mailbox_);
+ bool requires_commit,
+ bool allow_mailbox_reuse) {
DCHECK(!mailbox.IsValid() || !holder_ref_ ||
- !mailbox.Equals(holder_ref_->holder()->mailbox()));
+ !mailbox.Equals(holder_ref_->holder()->mailbox()) ||
+ allow_mailbox_reuse);
DCHECK_EQ(mailbox.IsValid(), !!release_callback);
// If we never commited the mailbox, we need to release it here.
else
SetNeedsPushProperties();
+ UpdateDrawsContent(HasDrawableContent());
// The active frame needs to be replaced and the mailbox returned before the
// commit is called complete.
SetNextCommitWaitsForActivation();
void TextureLayer::SetTextureMailbox(
const TextureMailbox& mailbox,
scoped_ptr<SingleReleaseCallback> release_callback) {
+ bool requires_commit = true;
+ bool allow_mailbox_reuse = false;
SetTextureMailboxInternal(
- mailbox,
- release_callback.Pass(),
- true /* requires_commit */);
+ mailbox, release_callback.Pass(), requires_commit, allow_mailbox_reuse);
}
-void TextureLayer::WillModifyTexture() {
- if (!uses_mailbox_ && layer_tree_host() && (DrawsContent() ||
- content_committed_)) {
- layer_tree_host()->AcquireLayerTextures();
- content_committed_ = false;
- }
+static void IgnoreReleaseCallback(uint32 sync_point, bool lost) {}
+
+void TextureLayer::SetTextureMailboxWithoutReleaseCallback(
+ const TextureMailbox& mailbox) {
+ // We allow reuse of the mailbox if there is a new sync point signalling new
+ // content, and the release callback goes nowhere since we'll be calling it
+ // multiple times for the same mailbox.
+ DCHECK(!mailbox.IsValid() || !holder_ref_ ||
+ !mailbox.Equals(holder_ref_->holder()->mailbox()) ||
+ mailbox.sync_point() != holder_ref_->holder()->mailbox().sync_point());
+ scoped_ptr<SingleReleaseCallback> release;
+ bool requires_commit = true;
+ bool allow_mailbox_reuse = true;
+ if (mailbox.IsValid())
+ release = SingleReleaseCallback::Create(base::Bind(&IgnoreReleaseCallback));
+ SetTextureMailboxInternal(
+ mailbox, release.Pass(), requires_commit, allow_mailbox_reuse);
}
void TextureLayer::SetNeedsDisplayRect(const gfx::RectF& dirty_rect) {
}
if (layer_tree_host()) {
- if (texture_id_) {
- layer_tree_host()->AcquireLayerTextures();
- // The texture id needs to be removed from the active tree before the
- // commit is called complete.
- SetNextCommitWaitsForActivation();
- }
if (rate_limit_context_ && client_)
layer_tree_host()->StopRateLimiter();
}
// If we're removed from the tree, the TextureLayerImpl will be destroyed, and
// we will need to set the mailbox again on a new TextureLayerImpl the next
// time we push.
- if (!host && uses_mailbox_ && holder_ref_) {
+ if (!host && holder_ref_) {
needs_set_mailbox_ = true;
// The active frame needs to be replaced and the mailbox returned before the
// commit is called complete.
Layer::SetLayerTreeHost(host);
}
-bool TextureLayer::DrawsContent() const {
- return (client_ || texture_id_ || holder_ref_) && Layer::DrawsContent();
+bool TextureLayer::HasDrawableContent() const {
+ return (client_ || holder_ref_) && Layer::HasDrawableContent();
}
bool TextureLayer::Update(ResourceUpdateQueue* queue,
- const OcclusionTracker* occlusion) {
+ const OcclusionTracker<Layer>* occlusion) {
bool updated = Layer::Update(queue, occlusion);
if (client_) {
- if (uses_mailbox_) {
- TextureMailbox mailbox;
- scoped_ptr<SingleReleaseCallback> release_callback;
- if (client_->PrepareTextureMailbox(
- &mailbox,
- &release_callback,
- layer_tree_host()->UsingSharedMemoryResources())) {
- // Already within a commit, no need to do another one immediately.
- SetTextureMailboxInternal(
- mailbox,
- release_callback.Pass(),
- false /* requires_commit */);
- updated = true;
- }
- } else {
- texture_id_ = client_->PrepareTexture();
+ TextureMailbox mailbox;
+ scoped_ptr<SingleReleaseCallback> release_callback;
+ if (client_->PrepareTextureMailbox(
+ &mailbox,
+ &release_callback,
+ layer_tree_host()->UsingSharedMemoryResources())) {
+ // Already within a commit, no need to do another one immediately.
+ bool requires_commit = false;
+ bool allow_mailbox_reuse = false;
+ SetTextureMailboxInternal(mailbox,
+ release_callback.Pass(),
+ requires_commit,
+ allow_mailbox_reuse);
updated = true;
- SetNeedsPushProperties();
- // The texture id needs to be removed from the active tree before the
- // commit is called complete.
- SetNextCommitWaitsForActivation();
}
}
texture_layer->SetVertexOpacity(vertex_opacity_);
texture_layer->SetPremultipliedAlpha(premultiplied_alpha_);
texture_layer->SetBlendBackgroundColor(blend_background_color_);
- if (uses_mailbox_ && needs_set_mailbox_) {
+ if (needs_set_mailbox_) {
TextureMailbox texture_mailbox;
scoped_ptr<SingleReleaseCallback> release_callback;
if (holder_ref_) {
}
texture_layer->SetTextureMailbox(texture_mailbox, release_callback.Pass());
needs_set_mailbox_ = false;
- } else {
- texture_layer->SetTextureId(texture_id_);
- content_committed_ = DrawsContent();
}
}
projects / platform / framework / web / crosswalk.git / blobdiff