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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 13886018: Add a factory and defines for native Linux surfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get {base,ui,aura}_unittests working with native linux surface 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: content/browser/renderer_host/render_process_host_impl.cc
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 4c0225d51a784a830cbabf6ac98dc6c6c09ac401..418be16ab9040c9ff4fa4defd820d3e86656e342 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1030,10 +1030,10 @@ TransportDIB* RenderProcessHostImpl::MapTransportDIB(
STANDARD_RIGHTS_REQUIRED | FILE_MAP_READ | FILE_MAP_WRITE,
FALSE, 0);
return TransportDIB::Map(section);
+#elif defined(OS_ANDROID) || defined(USE_NATIVE_SURFACE_LINUX)
+ return TransportDIB::Map(dib_id);
#elif defined(TOOLKIT_GTK) || (defined(OS_LINUX) && defined(USE_AURA))
return TransportDIB::Map(dib_id.shmkey);
-#elif defined(OS_ANDROID)
- return TransportDIB::Map(dib_id);
#else
// On POSIX, the browser allocates all DIBs and keeps a file descriptor around
// for each.

Powered by Google App Engine
This is Rietveld 408576698