| Index: cc/resources/texture_mailbox.cc
|
| diff --git a/cc/resources/texture_mailbox.cc b/cc/resources/texture_mailbox.cc
|
| index 90ce6be79c79272508dcba015fd9549c0f11b961..838e8fbd6ad5fad579a774f5078876c754fe0fd3 100644
|
| --- a/cc/resources/texture_mailbox.cc
|
| +++ b/cc/resources/texture_mailbox.cc
|
| @@ -10,19 +10,22 @@
|
|
|
| namespace cc {
|
|
|
| -TextureMailbox::TextureMailbox() : shared_memory_(NULL) {}
|
| +TextureMailbox::TextureMailbox() : shared_memory_(nullptr) {
|
| +}
|
|
|
| TextureMailbox::TextureMailbox(const gpu::MailboxHolder& mailbox_holder)
|
| : mailbox_holder_(mailbox_holder),
|
| - shared_memory_(NULL),
|
| - allow_overlay_(false) {}
|
| + shared_memory_(nullptr),
|
| + allow_overlay_(false) {
|
| +}
|
|
|
| TextureMailbox::TextureMailbox(const gpu::Mailbox& mailbox,
|
| uint32 target,
|
| uint32 sync_point)
|
| : mailbox_holder_(mailbox, target, sync_point),
|
| - shared_memory_(NULL),
|
| - allow_overlay_(false) {}
|
| + shared_memory_(nullptr),
|
| + allow_overlay_(false) {
|
| +}
|
|
|
| TextureMailbox::TextureMailbox(base::SharedMemory* shared_memory,
|
| const gfx::Size& size)
|
|
|