Rename LayoutPart::widget to LayoutPart::frameViewBase

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.widget()) {
+  if (m_layoutPart.frameViewBase()) {
     // TODO(schenney) crbug.com/93805 Speculative release assert to verify that
-    // the crashes we see in widget painting are due to a destroyed LayoutPart
-    // object.
+    // 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 =
           m_layoutPart.style()->getRoundedInnerBorderFor(
               borderRect,
               LayoutRectOutsets(
                   -(m_layoutPart.paddingTop() + m_layoutPart.borderTop()),
                   -(m_layoutPart.paddingRight() + m_layoutPart.borderRight()),
                   -(m_layoutPart.paddingBottom() + m_layoutPart.borderBottom()),
                   -(m_layoutPart.paddingLeft() + m_layoutPart.borderLeft())),
               true, true);
       clipper.emplace(m_layoutPart, paintInfo, borderRect, roundedInnerRect,
                       ApplyToDisplayList);
     }
 
     m_layoutPart.paintContents(paintInfo, paintOffset);
   }
 
-  // Paint a partially transparent wash over selected widgets.
+  // Paint a partially transparent wash over selected FrameViewBases.
   if (isSelected() && !paintInfo.isPrinting() &&
       !LayoutObjectDrawingRecorder::useCachedDrawingIfPossible(
           paintInfo.context, m_layoutPart, paintInfo.phase)) {
     LayoutRect rect = m_layoutPart.localSelectionRect();
     rect.moveBy(adjustedPaintOffset);
     IntRect selectionRect = pixelSnappedIntRect(rect);
     LayoutObjectDrawingRecorder drawingRecorder(paintInfo.context, m_layoutPart,
                                                 paintInfo.phase, selectionRect);
     paintInfo.context.fillRect(selectionRect,
                                m_layoutPart.selectionBackgroundColor());
   }
 
   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.widget();
+  FrameViewBase* frameViewBase = m_layoutPart.frameViewBase();
   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 widgets at our
-  // desired location, we need to apply paint offset as a transform, with the
-  // frame rect neutralized.
-  IntSize widgetPaintOffset =
+  // 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(widgetPaintOffset.width(),
-                                   widgetPaintOffset.height()));
-  CullRect adjustedCullRect(paintInfo.cullRect(), -widgetPaintOffset);
+      AffineTransform::translation(frameViewBasePaintOffset.width(),
+                                   frameViewBasePaintOffset.height()));
+  CullRect adjustedCullRect(paintInfo.cullRect(), -frameViewBasePaintOffset);
   frameViewBase->paint(paintInfo.context, adjustedCullRect);
 }
 
 }  // namespace blink