Remove FrameViewBase as base class of PluginView.

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/frame/FrameOrPlugin.h"
 #include "core/layout/LayoutPart.h"
 #include "core/paint/BoxPainter.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/ReplacedPainter.h"
 #include "core/paint/RoundedInnerRectClipper.h"
 #include "core/paint/ScrollableAreaPainter.h"
 #include "core/paint/TransformRecorder.h"
@@ skipping 45 matching lines @@
     BoxPainter(layout_part_).PaintMask(paint_info, adjusted_paint_offset);
     return;
   }
 
   if (ShouldPaintSelfOutline(paint_info.phase))
     ObjectPainter(layout_part_).PaintOutline(paint_info, adjusted_paint_offset);
 
   if (paint_info.phase != kPaintPhaseForeground)
     return;
 
-  if (layout_part_.PluginOrFrame()) {
+  if (layout_part_.GetFrameOrPlugin()) {
     // 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(layout_part_.GetNode());
     Optional<RoundedInnerRectClipper> clipper;
     if (layout_part_.Style()->HasBorderRadius()) {
       if (border_rect.IsEmpty())
         return;
 
       FloatRoundedRect rounded_inner_rect =
@@ skipping 29 matching lines @@
     ScrollableAreaPainter(*layout_part_.Layer()->GetScrollableArea())
         .PaintResizer(paint_info.context,
                       RoundedIntPoint(adjusted_paint_offset),
                       paint_info.GetCullRect());
 }
 
 void PartPainter::PaintContents(const PaintInfo& paint_info,
                                 const LayoutPoint& paint_offset) {
   LayoutPoint adjusted_paint_offset = paint_offset + layout_part_.Location();
 
-  FrameViewBase* frame_view_base = layout_part_.PluginOrFrame();
-  CHECK(frame_view_base);
+  FrameOrPlugin* frame_or_plugin = layout_part_.GetFrameOrPlugin();
+  CHECK(frame_or_plugin);
 
   IntPoint paint_location(RoundedIntPoint(
       adjusted_paint_offset + layout_part_.ReplacedContentRect().Location()));
 
-  // FrameViewBases don't support painting with a paint offset, but instead
-  // offset themselves using the frame rect location. To paint FrameViewBases at
+  // Views don't support painting with a paint offset, but instead
+  // offset themselves using the frame rect location. To paint Views at
   // our desired location, we need to apply paint offset as a transform, with
   // the frame rect neutralized.
-  IntSize frame_view_base_paint_offset =
-      paint_location - frame_view_base->FrameRect().Location();
+  IntSize view_paint_offset =
+      paint_location - frame_or_plugin->FrameRect().Location();
   TransformRecorder transform(
       paint_info.context, layout_part_,
-      AffineTransform::Translation(frame_view_base_paint_offset.Width(),
-                                   frame_view_base_paint_offset.Height()));
-  CullRect adjusted_cull_rect(paint_info.GetCullRect(),
-                              -frame_view_base_paint_offset);
-  frame_view_base->Paint(paint_info.context, adjusted_cull_rect);
+      AffineTransform::Translation(view_paint_offset.Width(),
+                                   view_paint_offset.Height()));
+  CullRect adjusted_cull_rect(paint_info.GetCullRect(), -view_paint_offset);
+  frame_or_plugin->Paint(paint_info.context, adjusted_cull_rect);
 }
 
 }  // namespace blink