Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

content/plugin/webplugin_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/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 14 matching lines @@
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "ui/gfx/blit.h"
 #include "ui/gfx/canvas.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "content/plugin/webplugin_accelerated_surface_proxy_mac.h"
 #endif
 
-#if defined(USE_X11)
-#include "ui/base/x/x11_util_internal.h"
-#endif
-
 #if defined(OS_WIN)
 #include "content/common/plugin_process_messages.h"
 #include "content/public/common/sandbox_init.h"
 #endif
 
 using blink::WebBindings;
 
 namespace content {
 
 WebPluginProxy::SharedTransportDIB::SharedTransportDIB(TransportDIB* dib)
@@ skipping 11 matching lines @@
     : channel_(channel),
       route_id_(route_id),
       window_npobject_(NULL),
       plugin_element_(NULL),
       delegate_(NULL),
       waiting_for_paint_(false),
       page_url_(page_url),
       windowless_buffer_index_(0),
       host_render_view_routing_id_(host_render_view_routing_id),
       weak_factory_(this) {
-#if defined(USE_X11)
-  windowless_shm_pixmaps_[0] = None;
-  windowless_shm_pixmaps_[1] = None;
-  use_shm_pixmap_ = false;
-
-  // If the X server supports SHM pixmaps
-  // and the color depth and masks match,
-  // then consider using SHM pixmaps for windowless plugin painting.
-  XDisplay* display = gfx::GetXDisplay();
-  if (ui::QuerySharedMemorySupport(display) == ui::SHARED_MEMORY_PIXMAP &&
-      gfx::BitsPerPixelForPixmapDepth(
-          display, DefaultDepth(display, DefaultScreen(display))) == 32) {
-    Visual* vis = DefaultVisual(display, DefaultScreen(display));
-
-    if (vis->red_mask == 0xff0000 &&
-        vis->green_mask == 0xff00 &&
-        vis->blue_mask == 0xff)
-      use_shm_pixmap_ = true;
-  }
-#endif
 }
 
 WebPluginProxy::~WebPluginProxy() {
-#if defined(USE_X11)
-  if (windowless_shm_pixmaps_[0] != None)
-    XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[0]);
-  if (windowless_shm_pixmaps_[1] != None)
-    XFreePixmap(gfx::GetXDisplay(), windowless_shm_pixmaps_[1]);
-#endif
-
 #if defined(OS_MACOSX)
   // Destroy the surface early, since it may send messages during cleanup.
   if (accelerated_surface_)
     accelerated_surface_.reset();
 #endif
 
   if (plugin_element_)
     WebBindings::releaseObject(plugin_element_);
   if (window_npobject_)
     WebBindings::releaseObject(window_npobject_);
 }
 
 bool WebPluginProxy::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
 void WebPluginProxy::SetWindow(gfx::PluginWindowHandle window) {
   Send(new PluginHostMsg_SetWindow(route_id_, window));
 }
 
 void WebPluginProxy::SetAcceptsInputEvents(bool accepts) {
   NOTREACHED();
 }
 
 void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) {
 #if defined(OS_WIN)
   PluginThread::current()->Send(
       new PluginProcessHostMsg_PluginWindowDestroyed(
           window, ::GetParent(window)));
-#elif defined(USE_X11)
-  // Nothing to do.
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 #if defined(OS_WIN)
 void WebPluginProxy::SetWindowlessData(
     HANDLE pump_messages_event, gfx::NativeViewId dummy_activation_window) {
   HANDLE pump_messages_event_for_renderer = NULL;
   BrokerDuplicateHandle(pump_messages_event, channel_->peer_pid(),
@@ skipping 236 matching lines @@
   // TODO(caryclark): This is a temporary workaround to allow the Darwin / Skia
   // port to share code with the Darwin / CG port. All ports will eventually use
   // the common code below.
   delegate_->CGPaint(windowless_context(), rect);
   if (windowless_contexts_[saved_index].get() == saved_context_weak)
     CGContextRestoreGState(windowless_contexts_[saved_index]);
 #else
   // See above comment about windowless_context_ changing.
   // http::/crbug.com/139462
   skia::RefPtr<skia::PlatformCanvas> saved_canvas = windowless_canvas();
-#if defined(USE_X11)
-  scoped_refptr<SharedTransportDIB> local_dib_ref(
-      windowless_dibs_[windowless_buffer_index_]);
-#endif
 
   saved_canvas->save();
 
   // The given clip rect is relative to the plugin coordinate system.
   SkRect sk_rect = { SkIntToScalar(rect.x()),
                      SkIntToScalar(rect.y()),
                      SkIntToScalar(rect.right()),
                      SkIntToScalar(rect.bottom()) };
   saved_canvas->clipRect(sk_rect);
 
@@ skipping 29 matching lines @@
   // synchronous calls that lead to nested UpdateGeometry calls.
   if (TransportDIB::is_valid_handle(windowless_buffer0)) {
     // The plugin's rect changed, so now we have new buffers to draw into.
     SetWindowlessBuffers(windowless_buffer0,
                          windowless_buffer1,
                          window_rect);
   }
 
   DCHECK(0 <= windowless_buffer_index && windowless_buffer_index <= 1);
   windowless_buffer_index_ = windowless_buffer_index;
-#if defined(USE_X11)
-  delegate_->SetWindowlessShmPixmap(windowless_shm_pixmap());
-#endif
 
 #if defined(OS_MACOSX)
   delegate_->UpdateGeometryAndContext(
       window_rect, clip_rect, windowless_context());
 #else
   delegate_->UpdateGeometry(window_rect, clip_rect);
 #endif
 
   // Send over any pending invalidates which occured when the plugin was
   // off screen.
@@ skipping 73 matching lines @@
   CreateDIBAndCGContextFromHandle(windowless_buffer0,
                                   window_rect,
                                   &windowless_dibs_[0],
                                   &windowless_contexts_[0]);
   CreateDIBAndCGContextFromHandle(windowless_buffer1,
                                   window_rect,
                                   &windowless_dibs_[1],
                                   &windowless_contexts_[1]);
 }
 
-#elif defined(TOOLKIT_GTK)
-
-void WebPluginProxy::CreateDIBAndCanvasFromHandle(
-    const TransportDIB::Handle& dib_handle,
-    const gfx::Rect& window_rect,
-    scoped_refptr<SharedTransportDIB>* dib_out,
-    skia::RefPtr<skia::PlatformCanvas>* canvas) {
-  TransportDIB* dib = TransportDIB::Map(dib_handle);
-  // dib may be NULL if the renderer has already destroyed the TransportDIB by
-  // the time we receive the handle, e.g. in case of multiple resizes.
-  if (dib) {
-    *canvas = skia::AdoptRef(
-        dib->GetPlatformCanvas(window_rect.width(), window_rect.height()));
-  } else {
-    canvas->clear();
-  }
-  *dib_out = new SharedTransportDIB(dib);
-}
-
-void WebPluginProxy::CreateShmPixmapFromDIB(
-    TransportDIB* dib,
-    const gfx::Rect& window_rect,
-    XID* pixmap_out) {
-  if (dib) {
-    XDisplay* display = gfx::GetXDisplay();
-    XID root_window = ui::GetX11RootWindow();
-    XShmSegmentInfo shminfo = {0};
-
-    if (*pixmap_out != None)
-      XFreePixmap(display, *pixmap_out);
-
-    shminfo.shmseg = dib->MapToX(display);
-    // Create a shared memory pixmap based on the image buffer.
-    *pixmap_out = XShmCreatePixmap(display, root_window,
-                                   NULL, &shminfo,
-                                   window_rect.width(), window_rect.height(),
-                                   DefaultDepth(display,
-                                                DefaultScreen(display)));
-  }
-}
-
-void WebPluginProxy::SetWindowlessBuffers(
-    const TransportDIB::Handle& windowless_buffer0,
-    const TransportDIB::Handle& windowless_buffer1,
-    const gfx::Rect& window_rect) {
-  CreateDIBAndCanvasFromHandle(windowless_buffer0,
-                               window_rect,
-                               &windowless_dibs_[0],
-                               &windowless_canvases_[0]);
-  CreateDIBAndCanvasFromHandle(windowless_buffer1,
-                               window_rect,
-                               &windowless_dibs_[1],
-                               &windowless_canvases_[1]);
-
-  // If SHM pixmaps support is available, create SHM pixmaps to pass to the
-  // delegate for windowless plugin painting.
-  if (delegate_->IsWindowless() && use_shm_pixmap_) {
-    CreateShmPixmapFromDIB(windowless_dibs_[0]->dib(),
-                           window_rect,
-                           &windowless_shm_pixmaps_[0]);
-    CreateShmPixmapFromDIB(windowless_dibs_[1]->dib(),
-                           window_rect,
-                           &windowless_shm_pixmaps_[1]);
-  }
-}
-
 #else
 
 void WebPluginProxy::SetWindowlessBuffers(
     const TransportDIB::Handle& windowless_buffer0,
     const TransportDIB::Handle& windowless_buffer1,
     const gfx::Rect& window_rect) {
   NOTIMPLEMENTED();
 }
 
 #endif
@@ skipping 105 matching lines @@
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif
 
 }  // namespace content