Rework embeddedContentBox into embeddedReplacedContent

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 717 matching lines @@
     else
         LayoutSubtreeRootList::countObjectsNeedingLayoutInRoot(layoutView(), needsLayoutObjects, totalObjects);
 }
 
 inline void FrameView::forceLayoutParentViewIfNeeded()
 {
     LayoutPart* ownerLayoutObject = m_frame->ownerLayoutObject();
     if (!ownerLayoutObject || !ownerLayoutObject->frame())
         return;
 
-    LayoutBox* contentBox = embeddedContentBox();
+    LayoutReplaced* contentBox = embeddedReplacedContent();
     if (!contentBox)
         return;
 
     LayoutSVGRoot* svgRoot = toLayoutSVGRoot(contentBox);
     if (svgRoot->everHadLayout() && !svgRoot->needsLayout())
         return;
 
     // If the embedded SVG document appears the first time, the ownerLayoutObject has already finished
     // layout without knowing about the existence of the embedded SVG document, because LayoutReplaced
-    // embeddedContentBox() returns 0, as long as the embedded document isn't loaded yet. Before
+    // embeddedReplacedContent() returns 0, as long as the embedded document isn't loaded yet. Before
     // bothering to lay out the SVG document, mark the ownerLayoutObject needing layout and ask its
     // FrameView for a layout. After that the LayoutEmbeddedObject (ownerLayoutObject) carries the
     // correct size, which LayoutSVGRoot::computeReplacedLogicalWidth/Height rely on, when laying
     // out for the first time, or when the LayoutSVGRoot size has changed dynamically (eg. via <script>).
     RefPtrWillBeRawPtr<FrameView> frameView = ownerLayoutObject->frame()->view();
 
     // Mark the owner layoutObject as needing layout.
     ownerLayoutObject->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::Unknown);
 
     // Synchronously enter layout, to layout the view containing the host object/embed/iframe.
@@ skipping 406 matching lines @@
 
     size.scale(1 / zoom);
     return size;
 }
 
 DocumentLifecycle& FrameView::lifecycle() const
 {
     return m_frame->document()->lifecycle();
 }
 
-LayoutBox* FrameView::embeddedContentBox() const
+LayoutReplaced* FrameView::embeddedReplacedContent() const
 {
     LayoutView* layoutView = this->layoutView();
     if (!layoutView)
         return nullptr;
 
     LayoutObject* firstChild = layoutView->firstChild();
     if (!firstChild || !firstChild->isBox())
         return nullptr;
 
-    // Curently only embedded SVG documents participate in the size-negotiation logic.
+    // Currently only embedded SVG documents participate in the size-negotiation logic.
     if (firstChild->isSVGRoot())
-        return toLayoutBox(firstChild);
+        return toLayoutSVGRoot(firstChild);
 
     return nullptr;
 }
 
 
 void FrameView::addPart(LayoutPart* object)
 {
     m_parts.add(object);
 }
 
@@ skipping 646 matching lines @@
     // layout in that case.
 
     LayoutView* layoutView = this->layoutView();
     return layoutPending()
         || (layoutView && layoutView->needsLayout())
         || isSubtreeLayout();
 }
 
 void FrameView::setNeedsLayout()
 {
-    LayoutBox* box = embeddedContentBox();
+    LayoutReplaced* box = embeddedReplacedContent();
     // It's illegal to ask for layout changes during the layout compositing or paint invalidation step.
     // FIXME: the third conditional is a hack to support embedded SVG. See FrameView::forceLayoutParentViewIfNeeded and crbug.com/442939
     RELEASE_ASSERT(!m_frame->document() || m_frame->document()->lifecycle().stateAllowsLayoutInvalidation() || (box && box->isSVGRoot()));
 
     if (LayoutView* layoutView = this->layoutView())
         layoutView->setNeedsLayout(LayoutInvalidationReason::Unknown);
 }
 
 bool FrameView::isTransparent() const
 {
@@ skipping 2244 matching lines @@
     return m_hiddenForThrottling && m_crossOriginForThrottling;
 }
 
 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
 {
     ASSERT(layoutView());
     return *layoutView();
 }
 
 } // namespace blink