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

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

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify conditional to make work on non-Android Created 8 years, 11 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
« no previous file with comments | « content/browser/in_process_webkit/dom_storage_area.h ('k') | content/common/np_channel_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/mock_render_process_host.cc
diff --git a/content/browser/renderer_host/mock_render_process_host.cc b/content/browser/renderer_host/mock_render_process_host.cc
index 2eafb5f26f1af371f81c4df9ececf08c3347ef6c..60cd0b796e8363d8a32883dbb1d6953fa137b522 100644
--- a/content/browser/renderer_host/mock_render_process_host.cc
+++ b/content/browser/renderer_host/mock_render_process_host.cc
@@ -118,6 +118,9 @@ TransportDIB* MockRenderProcessHost::GetTransportDIB(TransportDIB::Id dib_id) {
// On Mac, TransportDIBs are always created in the browser, so we cannot map
// one from a dib_id.
transport_dib_ = TransportDIB::Create(100 * 100 * 4, 0);
+#elif defined(OS_ANDROID)
+ // On Android, Handles and Ids are the same underlying type.
+ transport_dib_ = TransportDIB::Map(dib_id);
#elif defined(OS_POSIX)
transport_dib_ = TransportDIB::Map(dib_id.shmkey);
#endif
« no previous file with comments | « content/browser/in_process_webkit/dom_storage_area.h ('k') | content/common/np_channel_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698