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

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

Issue 643583003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr in src/… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Presubmit fix Created 6 years, 2 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
« no previous file with comments | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/layers/texture_layer_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 : NULL; 28 cc::TextureLayerClient* cc_client = client_ ? this : nullptr;
29 scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(cc_client); 29 scoped_refptr<TextureLayer> layer = TextureLayer::CreateForMailbox(cc_client);
30 layer->SetIsDrawable(true); 30 layer->SetIsDrawable(true);
31 layer_.reset(new WebLayerImpl(layer)); 31 layer_.reset(new WebLayerImpl(layer));
32 } 32 }
33 33
34 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() { 34 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() {
35 static_cast<TextureLayer*>(layer_->layer())->ClearClient(); 35 static_cast<TextureLayer*>(layer_->layer())->ClearClient();
36 } 36 }
37 37
38 blink::WebLayer* WebExternalTextureLayerImpl::layer() { 38 blink::WebLayer* WebExternalTextureLayerImpl::layer() {
(...skipping 21 matching lines...) Expand all
60 60
61 void WebExternalTextureLayerImpl::setRateLimitContext(bool rate_limit) { 61 void WebExternalTextureLayerImpl::setRateLimitContext(bool rate_limit) {
62 static_cast<TextureLayer*>(layer_->layer())->SetRateLimitContext(rate_limit); 62 static_cast<TextureLayer*>(layer_->layer())->SetRateLimitContext(rate_limit);
63 } 63 }
64 64
65 bool WebExternalTextureLayerImpl::PrepareTextureMailbox( 65 bool WebExternalTextureLayerImpl::PrepareTextureMailbox(
66 cc::TextureMailbox* mailbox, 66 cc::TextureMailbox* mailbox,
67 scoped_ptr<cc::SingleReleaseCallback>* release_callback, 67 scoped_ptr<cc::SingleReleaseCallback>* release_callback,
68 bool use_shared_memory) { 68 bool use_shared_memory) {
69 blink::WebExternalTextureMailbox client_mailbox; 69 blink::WebExternalTextureMailbox client_mailbox;
70 WebExternalBitmapImpl* bitmap = NULL; 70 WebExternalBitmapImpl* bitmap = nullptr;
71 71
72 if (use_shared_memory) 72 if (use_shared_memory)
73 bitmap = AllocateBitmap(); 73 bitmap = AllocateBitmap();
74 if (!client_->prepareMailbox(&client_mailbox, bitmap)) { 74 if (!client_->prepareMailbox(&client_mailbox, bitmap)) {
75 if (bitmap) 75 if (bitmap)
76 free_bitmaps_.push_back(bitmap); 76 free_bitmaps_.push_back(bitmap);
77 return false; 77 return false;
78 } 78 }
79 gpu::Mailbox name; 79 gpu::Mailbox name;
80 name.SetName(client_mailbox.name); 80 name.SetName(client_mailbox.name);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 DCHECK(layer); 116 DCHECK(layer);
117 blink::WebExternalTextureMailbox available_mailbox; 117 blink::WebExternalTextureMailbox available_mailbox;
118 memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name)); 118 memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name));
119 available_mailbox.syncPoint = sync_point; 119 available_mailbox.syncPoint = sync_point;
120 if (bitmap) 120 if (bitmap)
121 layer->free_bitmaps_.push_back(bitmap); 121 layer->free_bitmaps_.push_back(bitmap);
122 layer->client_->mailboxReleased(available_mailbox, lost_resource); 122 layer->client_->mailboxReleased(available_mailbox, lost_resource);
123 } 123 }
124 124
125 } // namespace cc_blink 125 } // namespace cc_blink
OLDNEW
« no previous file with comments | « no previous file | cc/blink/web_layer_impl.cc » ('j') | cc/layers/texture_layer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698