| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/surface/transport_dib.h" | 5 #include "ui/surface/transport_dib.h" |
| 6 | 6 |
| 7 #include <errno.h> | 7 #include <errno.h> |
| 8 #include <stdlib.h> | 8 #include <stdlib.h> |
| 9 #include <sys/ipc.h> | 9 #include <sys/ipc.h> |
| 10 #include <sys/shm.h> | 10 #include <sys/shm.h> |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 } | 87 } |
| 88 | 88 |
| 89 // static | 89 // static |
| 90 bool TransportDIB::is_valid_id(Id id) { | 90 bool TransportDIB::is_valid_id(Id id) { |
| 91 return id.shmkey != -1; | 91 return id.shmkey != -1; |
| 92 } | 92 } |
| 93 | 93 |
| 94 skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) { | 94 skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) { |
| 95 if (address_ == kInvalidAddress && !Map()) | 95 if (address_ == kInvalidAddress && !Map()) |
| 96 return NULL; | 96 return NULL; |
| 97 scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas); | 97 return skia::CreatePlatformCanvas(w, h, true, |
| 98 if (!canvas->initialize(w, h, true, reinterpret_cast<uint8_t*>(memory()))) | 98 reinterpret_cast<uint8_t*>(memory()), |
| 99 return NULL; | 99 skia::RETURN_NULL_ON_FAILURE); |
| 100 return canvas.release(); | |
| 101 } | 100 } |
| 102 | 101 |
| 103 bool TransportDIB::Map() { | 102 bool TransportDIB::Map() { |
| 104 if (!is_valid_id(key_)) | 103 if (!is_valid_id(key_)) |
| 105 return false; | 104 return false; |
| 106 if (address_ != kInvalidAddress) | 105 if (address_ != kInvalidAddress) |
| 107 return true; | 106 return true; |
| 108 | 107 |
| 109 struct shmid_ds shmst; | 108 struct shmid_ds shmst; |
| 110 if (shmctl(key_.shmkey, IPC_STAT, &shmst) == -1) | 109 if (shmctl(key_.shmkey, IPC_STAT, &shmst) == -1) |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 if (!inflight_counter_ && detached_) | 146 if (!inflight_counter_ && detached_) |
| 148 delete this; | 147 delete this; |
| 149 } | 148 } |
| 150 | 149 |
| 151 void TransportDIB::Detach() { | 150 void TransportDIB::Detach() { |
| 152 CHECK(!detached_); | 151 CHECK(!detached_); |
| 153 detached_ = true; | 152 detached_ = true; |
| 154 if (!inflight_counter_) | 153 if (!inflight_counter_) |
| 155 delete this; | 154 delete this; |
| 156 } | 155 } |
| OLD | NEW |