Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1191 matching lines @@
   if (result != WebInputEventResult::NotHandled) {
     if (WebInputEvent::RawKeyDown == event.type()) {
       // Suppress the next keypress event unless the focused node is a plugin
       // node.  (Flash needs these keypress events to handle non-US keyboards.)
       Element* element = focusedElement();
       if (element && element->layoutObject() &&
           element->layoutObject()->isEmbeddedObject()) {
         if (event.windowsKeyCode == VKEY_TAB) {
           // If the plugin supports keyboard focus then we should not send a tab
           // keypress event.
-          FrameViewBase* frameViewBase =
-              toLayoutPart(element->layoutObject())->frameViewBase();
-          if (frameViewBase && frameViewBase->isPluginContainer()) {
+          PluginView* pluginView =
+              toLayoutPart(element->layoutObject())->plugin();
+          if (pluginView && pluginView->isPluginContainer()) {
             WebPluginContainerImpl* plugin =
-                toWebPluginContainerImpl(frameViewBase);
+                toWebPluginContainerImpl(pluginView);
             if (plugin && plugin->supportsKeyboardFocus())
               m_suppressNextKeypressEvent = true;
           }
         }
       } else {
         m_suppressNextKeypressEvent = true;
       }
     }
     return result;
   }
@@ skipping 2166 matching lines @@
 void WebViewImpl::performPluginAction(const WebPluginAction& action,
                                       const WebPoint& location) {
   // FIXME: Location is probably in viewport coordinates
   HitTestResult result = hitTestResultForRootFramePos(location);
   Node* node = result.innerNode();
   if (!isHTMLObjectElement(*node) && !isHTMLEmbedElement(*node))
     return;
 
   LayoutObject* object = node->layoutObject();
   if (object && object->isLayoutPart()) {
-    FrameViewBase* frameViewWidget = toLayoutPart(object)->frameViewBase();
-    if (frameViewWidget && frameViewWidget->isPluginContainer()) {
-      WebPluginContainerImpl* plugin =
-          toWebPluginContainerImpl(frameViewWidget);
+    PluginView* pluginView = toLayoutPart(object)->plugin();
+    if (pluginView && pluginView->isPluginContainer()) {
+      WebPluginContainerImpl* plugin = toWebPluginContainerImpl(pluginView);
       switch (action.type) {
         case WebPluginAction::Rotate90Clockwise:
           plugin->plugin()->rotateView(WebPlugin::RotationType90Clockwise);
           break;
         case WebPluginAction::Rotate90Counterclockwise:
           plugin->plugin()->rotateView(
               WebPlugin::RotationType90Counterclockwise);
           break;
         default:
           NOTREACHED();
@@ skipping 814 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink