Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc.
  *               All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 117 matching lines @@
   LayoutAnalyzer::Scope analyzer(*this);
 
   updateLogicalWidth();
   updateLogicalHeight();
 
   m_overflow.reset();
   addVisualEffectOverflow();
 
   updateLayerTransformAfterLayout();
 
-  FrameViewBase* frameViewBase = this->frameViewBase();
+  FrameViewBase* frameViewBase = this->pluginOrFrame();
   if (!frameViewBase && frameView())
     frameView()->addPartToUpdate(*this);
 
   clearNeedsLayout();
 }
 
 ScrollResult LayoutEmbeddedObject::scroll(ScrollGranularity granularity,
                                           const FloatSize&) {
   return ScrollResult();
 }
 
 CompositingReasons LayoutEmbeddedObject::additionalCompositingReasons() const {
   if (requiresAcceleratedCompositing())
     return CompositingReasonPlugin;
   return CompositingReasonNone;
 }
 
 LayoutReplaced* LayoutEmbeddedObject::embeddedReplacedContent() const {
   if (!node() || !frameViewBase() || !frameViewBase()->isFrameView())
     return nullptr;
   return toFrameView(frameViewBase())->embeddedReplacedContent();
 }
 
 }  // namespace blink