Remove windowed NPAPI code

content/renderer/npapi/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/npapi/webplugin_delegate_proxy.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 87 matching lines @@
 }  // namespace
 
 WebPluginDelegateProxy::WebPluginDelegateProxy(
     WebPluginImpl* plugin,
     const std::string& mime_type,
     const base::WeakPtr<RenderViewImpl>& render_view,
     RenderFrameImpl* render_frame)
     : render_view_(render_view),
       render_frame_(render_frame),
       plugin_(plugin),
-      uses_shared_bitmaps_(false),
+      uses_shared_bitmaps_(true),
 #if defined(OS_MACOSX)
       uses_compositor_(false),
 #elif defined(OS_WIN)
       dummy_activation_window_(NULL),
 #endif
-      window_(gfx::kNullPluginWindow),
       mime_type_(mime_type),
       instance_id_(MSG_ROUTING_NONE),
       npobject_(NULL),
       npp_(new NPP_t),
       sad_plugin_(NULL),
       invalidate_pending_(false),
       transparent_(false),
       front_buffer_index_(0),
       page_url_(render_view_->webview()->mainFrame()->document().url()) {
 }
@@ skipping 15 matching lines @@
 #endif
 
 #if defined(OS_WIN)
   if (dummy_activation_window_ && render_view_) {
     render_view_->Send(new ViewHostMsg_WindowlessPluginDummyWindowDestroyed(
         render_view_->GetRoutingID(), dummy_activation_window_));
   }
   dummy_activation_window_ = NULL;
 #endif
 
-  if (window_)
-    WillDestroyWindow();
-
   if (render_view_.get())
     render_view_->UnregisterPluginDelegate(this);
 
   if (channel_host_.get()) {
     Send(new PluginMsg_DestroyInstance(instance_id_));
 
     // Must remove the route after sending the destroy message, rather than
     // before, since RemoveRoute can lead to all the outstanding NPObjects
     // being told the channel went away if this was the last instance.
     channel_host_->RemoveRoute(instance_id_);
@@ skipping 128 matching lines @@
   }
 
   return channel_host_->Send(msg);
 }
 
 bool WebPluginDelegateProxy::OnMessageReceived(const IPC::Message& msg) {
   GetContentClient()->SetActiveURL(page_url_);
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WebPluginDelegateProxy, msg)
-    IPC_MESSAGE_HANDLER(PluginHostMsg_SetWindow, OnSetWindow)
     IPC_MESSAGE_HANDLER(PluginHostMsg_InvalidateRect, OnInvalidateRect)
     IPC_MESSAGE_HANDLER(PluginHostMsg_GetWindowScriptNPObject,
                         OnGetWindowScriptNPObject)
     IPC_MESSAGE_HANDLER(PluginHostMsg_GetPluginElement, OnGetPluginElement)
     IPC_MESSAGE_HANDLER(PluginHostMsg_ResolveProxy, OnResolveProxy)
     IPC_MESSAGE_HANDLER(PluginHostMsg_SetCookie, OnSetCookie)
     IPC_MESSAGE_HANDLER(PluginHostMsg_GetCookies, OnGetCookies)
     IPC_MESSAGE_HANDLER(PluginHostMsg_CancelDocumentLoad, OnCancelDocumentLoad)
     IPC_MESSAGE_HANDLER(PluginHostMsg_DidStartLoading, OnDidStartLoading)
     IPC_MESSAGE_HANDLER(PluginHostMsg_DidStopLoading, OnDidStopLoading)
@@ skipping 14 matching lines @@
                         OnAcceleratedPluginSwappedIOSurface)
 #endif
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void WebPluginDelegateProxy::OnChannelError() {
   if (plugin_) {
-    if (window_) {
-      // The actual WebPluginDelegate never got a chance to tell the WebPlugin
-      // its window was going away. Do it on its behalf.
-      WillDestroyWindow();
-    }
     plugin_->Invalidate();
   }
   if (channel_host_.get() && !channel_host_->expecting_shutdown()) {
     render_view_->GetMainRenderFrame()->PluginCrashed(
         info_.path, channel_host_->peer_pid());
   }
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   // Ensure that the renderer doesn't think the plugin still has focus.
   if (render_view_)
@@ skipping 358 matching lines @@
     return;
 
   IPC::Message* msg = new PluginMsg_ImeCompositionCompleted(instance_id_,
                                                             text);
   // Order relative to other key events is important.
   msg->set_unblock(true);
   Send(msg);
 }
 #endif  // OS_MACOSX
 
-void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
-#if defined(OS_MACOSX)
-  uses_shared_bitmaps_ = !window && !uses_compositor_;
-#else
-  uses_shared_bitmaps_ = !window;
-#endif
-  window_ = window;
-  if (plugin_)
-    plugin_->SetWindow(window);
-}
-
-void WebPluginDelegateProxy::WillDestroyWindow() {
-  DCHECK(window_);
-  plugin_->WillDestroyWindow(window_);
-  window_ = gfx::kNullPluginWindow;
-}
-
 #if defined(OS_WIN)
 void WebPluginDelegateProxy::OnSetWindowlessData(
       HANDLE modal_loop_pump_messages_event_handle,
       gfx::NativeViewId dummy_activation_window) {
   DCHECK(!modal_loop_pump_messages_event_.get());
   DCHECK(!dummy_activation_window_);
   base::win::ScopedHandle modal_loop_pump_messages_event(
       modal_loop_pump_messages_event_handle);
 
   dummy_activation_window_ = dummy_activation_window;
@@ skipping 163 matching lines @@
   if (render_view_)
     render_view_->PluginFocusChanged(focused, instance_id_);
 }
 
 void WebPluginDelegateProxy::OnStartIme() {
   if (render_view_)
     render_view_->StartPluginIme();
 }
 #endif
 
-gfx::PluginWindowHandle WebPluginDelegateProxy::GetPluginWindowHandle() {
-  return window_;
-}
-
 void WebPluginDelegateProxy::OnCancelDocumentLoad() {
   plugin_->CancelDocumentLoad();
 }
 
 void WebPluginDelegateProxy::OnDidStartLoading() {
   plugin_->DidStartLoading();
 }
 
 void WebPluginDelegateProxy::OnDidStopLoading() {
   plugin_->DidStopLoading();
 }
 
 #if defined(OS_MACOSX)
 void WebPluginDelegateProxy::OnAcceleratedPluginEnabledRendering() {
   uses_compositor_ = true;
-  OnSetWindow(gfx::kNullPluginWindow);
+  uses_shared_bitmaps_ = false;
 }
 
 void WebPluginDelegateProxy::OnAcceleratedPluginAllocatedIOSurface(
     int32_t width,
     int32_t height,
     uint32_t surface_id) {
   if (plugin_)
     plugin_->AcceleratedPluginAllocatedIOSurface(width, height, surface_id);
 }
 
@@ skipping 22 matching lines @@
         index->mime_type == "application/x-vnd.movenetworks.qm" ||
         index->mime_type == "application/x-vnd.mnplayer.qm") {
       return true;
     }
   }
   return false;
 }
 #endif
 
 }  // namespace content