Remove windowed NPAPI code

content/renderer/npapi/webplugin_impl.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_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/location.h"
@@ skipping 174 matching lines @@
   // Note that |canvas| is only used when in windowless mode.
   delegate_->Paint(canvas, paint_rect);
 }
 
 void WebPluginImpl::updateGeometry(const WebRect& window_rect,
                                    const WebRect& clip_rect,
                                    const WebRect& unobscured_rect,
                                    const WebVector<WebRect>& cut_outs_rects,
                                    bool is_visible) {
   WebPluginGeometry new_geometry;
-  new_geometry.window = window_;
   new_geometry.window_rect = window_rect;
   new_geometry.clip_rect = clip_rect;
   new_geometry.visible = is_visible;
   new_geometry.rects_valid = true;
   for (size_t i = 0; i < cut_outs_rects.size(); ++i)
     new_geometry.cutout_rects.push_back(cut_outs_rects[i]);
 
-  // Only send DidMovePlugin if the geometry changed in some way.
-  if (window_ && (first_geometry_update_ || !new_geometry.Equals(geometry_))) {
-    render_frame_->GetRenderWidget()->SchedulePluginMove(new_geometry);
-    // We invalidate windowed plugins during the first geometry update to
-    // ensure that they get reparented to the wrapper window in the browser.
-    // This ensures that they become visible and are painted by the OS. This is
-    // required as some pages don't invalidate when the plugin is added.
-    if (first_geometry_update_ && window_) {
-      InvalidateRect(window_rect);
-    }
-  }
-
   // Only UpdateGeometry if either the window or clip rects have changed.
   if (delegate_ && (first_geometry_update_ ||
       new_geometry.window_rect != geometry_.window_rect ||
       new_geometry.clip_rect != geometry_.clip_rect)) {
     // Notify the plugin that its parameters have changed.
     delegate_->UpdateGeometry(new_geometry.window_rect, new_geometry.clip_rect);
   }
 
 #if defined(OS_WIN)
   // Don't cache the geometry during the first geometry update. The first
   // geometry update sequence is received when Widget::setParent is called.
   // For plugins like media player which have a bug where they only honor
   // the first geometry update, we have a quirk which ignores the first
   // geometry update. To ensure that these plugins work correctly in cases
   // where we receive only one geometry update from webkit, we also force
   // a geometry update during paint which should go out correctly as the
   // initial geometry update was not cached.
   if (!first_geometry_update_)
     geometry_ = new_geometry;
 #else  // OS_WIN
   geometry_ = new_geometry;
 #endif  // OS_WIN
   first_geometry_update_ = false;
 }
 
 void WebPluginImpl::updateFocus(bool focused, blink::WebFocusType focus_type) {
-  if (accepts_input_events_)
-    delegate_->SetFocus(focused);
+  delegate_->SetFocus(focused);
 }
 
 void WebPluginImpl::updateVisibility(bool visible) {
-  if (!window_)
-    return;
-
-  WebPluginGeometry move;
-  move.window = window_;
-  move.window_rect = gfx::Rect();
-  move.clip_rect = gfx::Rect();
-  move.rects_valid = false;
-  move.visible = visible;
-
-  render_frame_->GetRenderWidget()->SchedulePluginMove(move);
 }
 
 bool WebPluginImpl::acceptsInputEvents() {
-  return accepts_input_events_;
+  return true;
 }
 
 WebInputEventResult WebPluginImpl::handleInputEvent(
     const WebInputEvent& event,
     WebCursorInfo& cursor_info) {
   // Swallow context menu events in order to suppress the default context menu.
   if (event.type == WebInputEvent::ContextMenu)
     return WebInputEventResult::HandledSuppressed;
 
   WebCursor::CursorInfo web_cursor_info;
@@ skipping 14 matching lines @@
 }
 
 // -----------------------------------------------------------------------------
 
 WebPluginImpl::WebPluginImpl(
     WebFrame* webframe,
     const WebPluginParams& params,
     const base::FilePath& file_path,
     const base::WeakPtr<RenderViewImpl>& render_view,
     RenderFrameImpl* render_frame)
-    : windowless_(false),
-      window_(gfx::kNullPluginWindow),
-      accepts_input_events_(false),
-      render_frame_(render_frame),
+    : render_frame_(render_frame),
       render_view_(render_view),
       webframe_(webframe),
       delegate_(NULL),
       container_(NULL),
       npp_(NULL),
       plugin_url_(params.url),
       load_manually_(params.loadManually),
       first_geometry_update_(true),
       ignore_response_error_(false),
       file_path_(file_path),
       mime_type_(base::ToLowerASCII(base::UTF16ToASCII(
           base::StringPiece16(params.mimeType)))) {
   DCHECK_EQ(params.attributeNames.size(), params.attributeValues.size());
 
   for (size_t i = 0; i < params.attributeNames.size(); ++i) {
     arg_names_.push_back(params.attributeNames[i].utf8());
     arg_values_.push_back(params.attributeValues[i].utf8());
   }
 
   // Set subresource URL for crash reporting.
   base::debug::SetCrashKeyValue("subresource_url", plugin_url_.spec());
 }
 
 WebPluginImpl::~WebPluginImpl() {
 }
 
-void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
-  if (window) {
-    DCHECK(!windowless_);
-    window_ = window;
-#if defined(OS_MACOSX)
-    // TODO(kbr): remove. http://crbug.com/105344
-
-    // Lie to ourselves about being windowless even if we got a fake
-    // plugin window handle, so we continue to get input events.
-    windowless_ = true;
-    accepts_input_events_ = true;
-    // We do not really need to notify the page delegate that a plugin
-    // window was created -- so don't.
-#else
-    accepts_input_events_ = false;
-
-#endif  // OS_MACOSX
-  } else {
-    DCHECK(!window_);  // Make sure not called twice.
-    windowless_ = true;
-    accepts_input_events_ = true;
-  }
-}
-
-void WebPluginImpl::SetAcceptsInputEvents(bool accepts) {
-  accepts_input_events_ = accepts;
-}
-
-void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) {
-  DCHECK_EQ(window, window_);
-  window_ = gfx::kNullPluginWindow;
-  if (render_view_.get())
-    render_frame_->GetRenderWidget()->CleanupWindowInPluginMoves(window);
-}
-
 GURL WebPluginImpl::CompleteURL(const char* url) {
   if (!webframe_) {
     NOTREACHED();
     return GURL();
   }
   // TODO(darin): Is conversion from UTF8 correct here?
   return webframe_->document().completeURL(WebString::fromUTF8(url));
 }
 
 bool WebPluginImpl::SetPostData(WebURLRequest* request,
@@ skipping 372 matching lines @@
     case PLUGIN_SRC:
       webframe_->setReferrerForRequest(*request, plugin_url_);
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace content