Revert 132218 - Convert plugin and GPU process to brokered handle duplication.

content/renderer/webplugin_delegate_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #elif defined(USE_X11)
 #include <cairo/cairo.h>
 #endif
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "content/common/child_process.h"
 #include "content/common/npobject_proxy.h"
 #include "content/common/npobject_stub.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
@@ skipping 22 matching lines @@
 #include "webkit/plugins/sad_plugin.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
-#if defined(OS_WIN)
-#include "content/common/sandbox_policy.h"
-#endif
-
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using WebKit::WebDragData;
 using WebKit::WebInputEvent;
 using WebKit::WebString;
 using WebKit::WebView;
 
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.
 class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
@@ skipping 404 matching lines @@
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Ensure that the renderer doesn't think the plugin still has focus.
   if (render_view_)
     render_view_->PluginFocusChanged(false, instance_id_);
 #endif
 }
 
 static void CopyTransportDIBHandleForMessage(
     const TransportDIB::Handle& handle_in,
-    TransportDIB::Handle* handle_out,
-    base::ProcessId peer_pid) {
+    TransportDIB::Handle* handle_out) {
 #if defined(OS_MACOSX)
   // On Mac, TransportDIB::Handle is typedef'ed to FileDescriptor, and
   // FileDescriptor message fields needs to remain valid until the message is
   // sent or else the sendmsg() call will fail.
   if ((handle_out->fd = HANDLE_EINTR(dup(handle_in.fd))) < 0) {
     PLOG(ERROR) << "dup()";
     return;
   }
   handle_out->auto_close = true;
-#elif defined(OS_WIN)
-  // On Windows we need to duplicate the handle for the plugin process.
-  *handle_out = NULL;
-  sandbox::BrokerDuplicateHandle(handle_in, peer_pid, handle_out,
-                                 FILE_MAP_READ | FILE_MAP_WRITE, 0);
-  CHECK(*handle_out != NULL);
 #else
   // Don't need to do anything special for other platforms.
   *handle_out = handle_in;
 #endif
 }
 
 void WebPluginDelegateProxy::SendUpdateGeometry(
     bool bitmaps_changed) {
   PluginMsg_UpdateGeometry_Param param;
   param.window_rect = plugin_rect_;
   param.clip_rect = clip_rect_;
   param.windowless_buffer0 = TransportDIB::DefaultHandleValue();
   param.windowless_buffer1 = TransportDIB::DefaultHandleValue();
   param.windowless_buffer_index = back_buffer_index();
   param.background_buffer = TransportDIB::DefaultHandleValue();
   param.transparent = transparent_;
 
 #if defined(OS_POSIX)
   // If we're using POSIX mmap'd TransportDIBs, sending the handle across
   // IPC establishes a new mapping rather than just sending a window ID,
   // so only do so if we've actually changed the shared memory bitmaps.
   if (bitmaps_changed)
 #endif
   {
     if (transport_stores_[0].dib.get())
       CopyTransportDIBHandleForMessage(transport_stores_[0].dib->handle(),
-                                       &param.windowless_buffer0,
-                                       channel_host_->peer_pid());
+                                       &param.windowless_buffer0);
 
     if (transport_stores_[1].dib.get())
       CopyTransportDIBHandleForMessage(transport_stores_[1].dib->handle(),
-                                       &param.windowless_buffer1,
-                                       channel_host_->peer_pid());
+                                       &param.windowless_buffer1);
 
     if (background_store_.dib.get())
       CopyTransportDIBHandleForMessage(background_store_.dib->handle(),
-                                       &param.background_buffer,
-                                       channel_host_->peer_pid());
+                                       &param.background_buffer);
   }
 
   IPC::Message* msg;
 #if defined(OS_WIN)
   if (UseSynchronousGeometryUpdates()) {
     msg = new PluginMsg_UpdateGeometrySync(instance_id_, param);
   } else  // NOLINT
 #endif
   {
     msg = new PluginMsg_UpdateGeometry(instance_id_, param);
@@ skipping 916 matching lines @@
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }