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

Side by Side Diff: cc/blink/web_external_texture_layer_impl.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 years, 7 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "cc/blink/web_external_texture_layer_impl.h" 5 #include "cc/blink/web_external_texture_layer_impl.h"
6 6
7 #include "cc/blink/web_external_bitmap_impl.h" 7 #include "cc/blink/web_external_bitmap_impl.h"
8 #include "cc/blink/web_layer_impl.h" 8 #include "cc/blink/web_layer_impl.h"
9 #include "cc/layers/texture_layer.h" 9 #include "cc/layers/texture_layer.h"
10 #include "cc/resources/resource_update_queue.h" 10 #include "cc/resources/resource_update_queue.h"
11 #include "cc/resources/single_release_callback.h" 11 #include "cc/resources/single_release_callback.h"
12 #include "cc/resources/texture_mailbox.h" 12 #include "cc/resources/texture_mailbox.h"
13 #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h" 13 #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h"
14 #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h" 14 #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h"
15 #include "third_party/WebKit/public/platform/WebFloatRect.h" 15 #include "third_party/WebKit/public/platform/WebFloatRect.h"
16 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" 16 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
17 #include "third_party/WebKit/public/platform/WebSize.h" 17 #include "third_party/WebKit/public/platform/WebSize.h"
18 #include "third_party/khronos/GLES2/gl2.h" 18 #include "third_party/khronos/GLES2/gl2.h"
19 19
20 using cc::TextureLayer; 20 using cc::TextureLayer;
21 using cc::ResourceUpdateQueue; 21 using cc::ResourceUpdateQueue;
22 22
23 namespace cc_blink { 23 namespace cc_blink {
24 24
25 WebExternalTextureLayerImpl::WebExternalTextureLayerImpl( 25 WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
26 blink::WebExternalTextureLayerClient* client) 26 blink::WebExternalTextureLayerClient* client)
27 : client_(client) { 27 : client_(client) {
28 cc::TextureLayerClient* cc_client = client_ ? this : nullptr; 28 cc::TextureLayerClient* cc_client = client_ ? this : nullptr;
29 scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(cc_client); 29 scoped_refptr<TextureLayer> layer =
30 TextureLayer::CreateForMailbox(WebLayerImpl::LayerSettings(), cc_client);
30 layer->SetIsDrawable(true); 31 layer->SetIsDrawable(true);
31 layer_.reset(new WebLayerImpl(layer)); 32 layer_.reset(new WebLayerImpl(layer));
32 } 33 }
33 34
34 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() { 35 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() {
35 static_cast<TextureLayer*>(layer_->layer())->ClearClient(); 36 static_cast<TextureLayer*>(layer_->layer())->ClearClient();
36 } 37 }
37 38
38 blink::WebLayer* WebExternalTextureLayerImpl::layer() { 39 blink::WebLayer* WebExternalTextureLayerImpl::layer() {
39 return layer_.get(); 40 return layer_.get();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 DCHECK(layer); 123 DCHECK(layer);
123 blink::WebExternalTextureMailbox available_mailbox; 124 blink::WebExternalTextureMailbox available_mailbox;
124 memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name)); 125 memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name));
125 available_mailbox.syncPoint = sync_point; 126 available_mailbox.syncPoint = sync_point;
126 if (bitmap) 127 if (bitmap)
127 layer->free_bitmaps_.push_back(bitmap); 128 layer->free_bitmaps_.push_back(bitmap);
128 layer->client_->mailboxReleased(available_mailbox, lost_resource); 129 layer->client_->mailboxReleased(available_mailbox, lost_resource);
129 } 130 }
130 131
131 } // namespace cc_blink 132 } // namespace cc_blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698