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

Unified Diff: app/surface/transport_dib_linux.cc

Issue 3834003: On Windows, create a new TransportDIB::Handle struct which includes the file (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Rebase Created 10 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 side-by-side diff with in-line comments
Download patch
Index: app/surface/transport_dib_linux.cc
diff --git a/app/surface/transport_dib_linux.cc b/app/surface/transport_dib_linux.cc
index 26cad3f6f404a1a7a56851e47e660c81900ac390..ac8d71bbebab1581647519e77b9d8b22a7376b72 100644
--- a/app/surface/transport_dib_linux.cc
+++ b/app/surface/transport_dib_linux.cc
@@ -17,6 +17,9 @@
// The shmat system call uses this as it's invalid return address
static void *const kInvalidAddress = (void*) -1;
+void TransportDIB::ScopedHandle::Close() {
+}
+
TransportDIB::TransportDIB()
: key_(-1),
address_(kInvalidAddress),
@@ -65,34 +68,57 @@ TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) {
return dib;
}
-TransportDIB* TransportDIB::Map(Handle shmkey) {
- struct shmid_ds shmst;
- if (shmctl(shmkey, IPC_STAT, &shmst) == -1)
- return NULL;
-
- void* address = shmat(shmkey, NULL /* desired address */, 0 /* flags */);
- if (address == kInvalidAddress)
+// static
+TransportDIB* TransportDIB::Map(Handle handle) {
+ scoped_ptr<TransportDIB> dib(CreateWithHandle(handle));
+ if (!dib->Map())
return NULL;
+ return dib.release();
+}
+// static
+TransportDIB* TransportDIB::CreateWithHandle(Handle shmkey) {
TransportDIB* dib = new TransportDIB;
-
- dib->address_ = address;
- dib->size_ = shmst.shm_segsz;
dib->key_ = shmkey;
return dib;
}
+// static
bool TransportDIB::is_valid(Handle dib) {
return dib >= 0;
}
skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
+ if (address_ == kInvalidAddress && !Map())
+ return NULL;
scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas);
if (!canvas->initialize(w, h, true, reinterpret_cast<uint8_t*>(memory())))
return NULL;
return canvas.release();
}
+bool TransportDIB::Map() {
+ if (address_ != kInvalidAddress)
+ return true;
+
+ struct shmid_ds shmst;
+ if (shmctl(key_, IPC_STAT, &shmst) == -1)
+ return false;
+
+ void* address = shmat(key_, NULL /* desired address */, 0 /* flags */);
+ if (address == kInvalidAddress)
+ return false;
+
+ address_ = address;
+ size_ = shmst.shm_segsz;
+ return true;
+}
+
+TransportDIB::Handle TransportDIB::GetHandleForProcess(
+ base::ProcessHandle process_handle) const {
+ return handle();
+}
+
void* TransportDIB::memory() const {
DCHECK_NE(address_, kInvalidAddress);
return address_;

Powered by Google App Engine
This is Rietveld 408576698