Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/paint/PartPainter.cpp

 // Copyright 2014 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 "core/paint/PartPainter.h"
 
 #include "core/layout/LayoutPart.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
@@ skipping 51 matching lines @@
     BoxPainter(m_layoutPart).paintMask(paintInfo, adjustedPaintOffset);
     return;
   }
 
   if (shouldPaintSelfOutline(paintInfo.phase))
     ObjectPainter(m_layoutPart).paintOutline(paintInfo, adjustedPaintOffset);
 
   if (paintInfo.phase != PaintPhaseForeground)
     return;
 
-  if (m_layoutPart.frameViewBase()) {
+  if (m_layoutPart.pluginOrFrame()) {
     // TODO(schenney) crbug.com/93805 Speculative release assert to verify that
     // the crashes we see in FrameViewBase painting are due to a destroyed
     // LayoutPart object.
     CHECK(m_layoutPart.node());
     Optional<RoundedInnerRectClipper> clipper;
     if (m_layoutPart.style()->hasBorderRadius()) {
       if (borderRect.isEmpty())
         return;
 
       FloatRoundedRect roundedInnerRect =
@@ skipping 28 matching lines @@
   if (m_layoutPart.canResize())
     ScrollableAreaPainter(*m_layoutPart.layer()->getScrollableArea())
         .paintResizer(paintInfo.context, roundedIntPoint(adjustedPaintOffset),
                       paintInfo.cullRect());
 }
 
 void PartPainter::paintContents(const PaintInfo& paintInfo,
                                 const LayoutPoint& paintOffset) {
   LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location();
 
-  FrameViewBase* frameViewBase = m_layoutPart.frameViewBase();
+  FrameViewBase* frameViewBase = m_layoutPart.pluginOrFrame();
   CHECK(frameViewBase);
 
   IntPoint paintLocation(roundedIntPoint(
       adjustedPaintOffset + m_layoutPart.replacedContentRect().location()));
 
   // FrameViewBases don't support painting with a paint offset, but instead
   // offset themselves using the frame rect location. To paint FrameViewBases at
   // our desired location, we need to apply paint offset as a transform, with
   // the frame rect neutralized.
   IntSize frameViewBasePaintOffset =
       paintLocation - frameViewBase->frameRect().location();
   TransformRecorder transform(
       paintInfo.context, m_layoutPart,
       AffineTransform::translation(frameViewBasePaintOffset.width(),
                                    frameViewBasePaintOffset.height()));
   CullRect adjustedCullRect(paintInfo.cullRect(), -frameViewBasePaintOffset);
   frameViewBase->paint(paintInfo.context, adjustedCullRect);
 }
 
 }  // namespace blink