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

Unified Diff: ppapi/proxy/ppb_image_data_proxy.cc

Issue 13529027: Switch Linux Auru ports over to POSIX SHM instead of legacy SYSV SHM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 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: ppapi/proxy/ppb_image_data_proxy.cc
===================================================================
--- ppapi/proxy/ppb_image_data_proxy.cc (revision 192603)
+++ ppapi/proxy/ppb_image_data_proxy.cc (working copy)
@@ -431,20 +431,20 @@
ImageHandle ImageData::NullHandle() {
#if defined(OS_WIN)
return NULL;
-#elif defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(TOOLKIT_GTK)
+ return 0;
+#else
return ImageHandle();
-#else
- return 0;
#endif
}
ImageHandle ImageData::HandleFromInt(int32_t i) {
#if defined(OS_WIN)
return reinterpret_cast<ImageHandle>(i);
-#elif defined(OS_MACOSX) || defined(OS_ANDROID)
+#elif defined(TOOLKIT_GTK)
+ return static_cast<ImageHandle>(i);
+#else
return ImageHandle(i, false);
-#else
- return static_cast<ImageHandle>(i);
#endif
}
#endif // !defined(OS_NACL)

Powered by Google App Engine
This is Rietveld 408576698