Revert 94743 - Allow the renderer process to map textures from one context into another.

gpu/command_buffer/service/gpu_scheduler.cc

Index: gpu/command_buffer/service/gpu_scheduler.cc
===================================================================
--- gpu/command_buffer/service/gpu_scheduler.cc	(revision 94807)
+++ gpu/command_buffer/service/gpu_scheduler.cc	(working copy)
@@ -129,18 +129,6 @@
     return decoder_->SetParent(NULL, 0);
 }
 
-bool GpuScheduler::MapExternalResource(
-    resource_type::ResourceType resource_type,
-    uint32 resource_source_id,
-    GpuScheduler* source_scheduler,
-    uint32 resource_dest_id) {
-  return decoder_->MapExternalResource(
-      resource_type,
-      resource_source_id,
-      source_scheduler ? source_scheduler->decoder_.get() : NULL,
-      resource_dest_id);
-}
-
 #if defined(OS_MACOSX)
 namespace {
 const unsigned int kMaxOutstandingSwapBuffersCallsPerOnscreenContext = 1;
Property changes on: gpu/command_buffer/service/gpu_scheduler.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/o3d/gpu/command_buffer/service/gpu_scheduler.cc:r69-2775
   Merged /trunk/src/o3d/gpu/command_buffer/service/gpu_scheduler.cc:r32866-32958