Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/layout/LayoutPart.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, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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 10 matching lines @@
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "core/layout/LayoutPart.h"
 
 #include "core/dom/AXObjectCache.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLFrameElementBase.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutAPIShim.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/paint/PartPainter.h"
 #include "core/plugins/PluginView.h"
 
 namespace blink {
 
@@ skipping 50 matching lines @@
 FrameViewBase* LayoutPart::frameViewBase() const {
   // Plugin FrameViewBases are stored in their DOM node.
   Element* element = toElement(node());
 
   if (element && element->isFrameOwnerElement())
     return toHTMLFrameOwnerElement(element)->ownedWidget();
 
   return nullptr;
 }
 
+PluginView* LayoutPart::plugin() const {
+  // Plugins are stored in their DOM node.
+  return node() && isHTMLPlugInElement(node())
+             ? toHTMLPlugInElement(node())->plugin()
+             : nullptr;
+}
+
+FrameViewBase* LayoutPart::pluginOrFrame() const {
+  FrameViewBase* result = frameViewBase();
+  if (!result)
+    result = plugin();
+  return result;
+}
+
 PaintLayerType LayoutPart::layerTypeRequired() const {
   PaintLayerType type = LayoutReplaced::layerTypeRequired();
   if (type != NoPaintLayer)
     return type;
   return ForcedPaintLayer;
 }
 
 bool LayoutPart::requiresAcceleratedCompositing() const {
   // There are two general cases in which we can return true. First, if this is
   // a plugin LayoutObject and the plugin has a layer, then we need a layer.
   // Second, if this is a LayoutObject with a contentDocument and that document
   // needs a layer, then we need a layer.
-  if (frameViewBase() && frameViewBase()->isPluginView() &&
-      toPluginView(frameViewBase())->platformLayer())
+  PluginView* pluginView = plugin();
+  if (pluginView && pluginView->platformLayer())
     return true;
 
   if (!node() || !node()->isFrameOwnerElement())
     return false;
 
   HTMLFrameOwnerElement* element = toHTMLFrameOwnerElement(node());
   if (element->contentFrame() && element->contentFrame()->isRemoteFrame())
     return true;
 
   if (Document* contentDocument = element->contentDocument()) {
@@ skipping 106 matching lines @@
 
 CompositingReasons LayoutPart::additionalCompositingReasons() const {
   if (requiresAcceleratedCompositing())
     return CompositingReasonIFrame;
   return CompositingReasonNone;
 }
 
 void LayoutPart::styleDidChange(StyleDifference diff,
                                 const ComputedStyle* oldStyle) {
   LayoutReplaced::styleDidChange(diff, oldStyle);
-  FrameViewBase* frameViewBase = this->frameViewBase();
-
+  FrameViewBase* frameViewBase = this->pluginOrFrame();
   if (!frameViewBase)
     return;
 
   // If the iframe has custom scrollbars, recalculate their style.
-  if (frameViewBase && frameViewBase->isFrameView())
+  if (frameViewBase->isFrameView())
     toFrameView(frameViewBase)->recalculateCustomScrollbarStyle();
 
   if (style()->visibility() != EVisibility::kVisible) {
     frameViewBase->hide();
   } else {
     frameViewBase->show();
   }
 }
 
 void LayoutPart::layout() {
   ASSERT(needsLayout());
   LayoutAnalyzer::Scope analyzer(*this);
   clearNeedsLayout();
 }
 
 void LayoutPart::paint(const PaintInfo& paintInfo,
                        const LayoutPoint& paintOffset) const {
   PartPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void LayoutPart::paintContents(const PaintInfo& paintInfo,
                                const LayoutPoint& paintOffset) const {
   PartPainter(*this).paintContents(paintInfo, paintOffset);
 }
 
 CursorDirective LayoutPart::getCursor(const LayoutPoint& point,
                                       Cursor& cursor) const {
-  if (frameViewBase() && frameViewBase()->isPluginView()) {
+  if (plugin()) {
     // A plugin is responsible for setting the cursor when the pointer is over
     // it.
     return DoNotSetCursor;
   }
   return LayoutReplaced::getCursor(point, cursor);
 }
 
 LayoutRect LayoutPart::replacedContentRect() const {
   // We don't propagate sub-pixel into sub-frame layout, in other words, the
   // rect is snapped at the document boundary, and sub-pixel movement could
   // cause the sub-frame to layout due to the 1px snap difference. In order to
   // avoid that, the size of sub-frame is rounded in advance.
   LayoutRect sizeRoundedRect = contentBoxRect();
   sizeRoundedRect.setSize(LayoutSize(roundedIntSize(sizeRoundedRect.size())));
   return sizeRoundedRect;
 }
 
 void LayoutPart::updateOnWidgetChange() {
-  FrameViewBase* frameViewBase = this->frameViewBase();
+  FrameViewBase* frameViewBase = this->pluginOrFrame();
   if (!frameViewBase)
     return;
 
   if (!style())
     return;
 
   if (!needsLayout())
-    updateGeometryInternal();
+    updateGeometryInternal(*frameViewBase);
 
   if (style()->visibility() != EVisibility::kVisible) {
     frameViewBase->hide();
   } else {
     frameViewBase->show();
     // FIXME: Why do we issue a full paint invalidation in this case, but not
     // the other?
     setShouldDoFullPaintInvalidation();
   }
 }
 
 void LayoutPart::updateGeometry() {
-  FrameViewBase* frameViewBase = this->frameViewBase();
+  FrameViewBase* frameViewBase = this->pluginOrFrame();
   if (!frameViewBase ||
       !node())  // Check the node in case destroy() has been called.
     return;
 
   LayoutRect newFrame = replacedContentRect();
   DCHECK(newFrame.size() == roundedIntSize(newFrame.size()));
   bool boundsWillChange =
       LayoutSize(frameViewBase->frameRect().size()) != newFrame.size();
 
   FrameView* frameView =
       frameViewBase->isFrameView() ? toFrameView(frameViewBase) : nullptr;
 
   // If frame bounds are changing mark the view for layout. Also check the
   // frame's page to make sure that the frame isn't in the process of being
   // destroyed. If iframe scrollbars needs reconstruction from native to custom
   // scrollbar, then also we need to layout the frameview.
   if (frameView && frameView->frame().page() &&
       (boundsWillChange || frameView->needsScrollbarReconstruction()))
     frameView->setNeedsLayout();
 
-  updateGeometryInternal();
+  updateGeometryInternal(*frameViewBase);
 
   // If view needs layout, either because bounds have changed or possibly
   // indicating content size is wrong, we have to do a layout to set the right
   // FrameViewBase size.
   if (frameView && frameView->needsLayout() && frameView->frame().page())
     frameView->layout();
 
   frameViewBase->geometryMayHaveChanged();
 }
 
-void LayoutPart::updateGeometryInternal() {
-  FrameViewBase* frameViewBase = this->frameViewBase();
-  DCHECK(frameViewBase);
-
+void LayoutPart::updateGeometryInternal(FrameViewBase& frameViewBase) {
   // Ignore transform here, as we only care about the sub-pixel accumulation.
   // TODO(trchen): What about multicol? Need a LayoutBox function to query
   // sub-pixel accumulation.
   LayoutPoint absoluteLocation(localToAbsolute(FloatPoint()));
   LayoutRect absoluteReplacedRect = replacedContentRect();
   absoluteReplacedRect.moveBy(absoluteLocation);
 
   IntRect frameRect(IntPoint(),
                     pixelSnappedIntRect(absoluteReplacedRect).size());
   // Normally the location of the frame rect is ignored by the painter, but
   // currently it is still used by a family of coordinate conversion function in
   // FrameViewBase/FrameView. This is incorrect because coordinate conversion
   // needs to take transform and into account. A few callers still use the
   // family of conversion function, including but not exhaustive:
   // FrameView::updateViewportIntersectionIfNeeded()
   // RemoteFrameView::frameRectsChanged().
   // WebPluginContainerImpl::reportGeometry()
   // TODO(trchen): Remove this hack once we fixed all callers.
   FloatRect absoluteBoundingBox =
       localToAbsoluteQuad(FloatRect(replacedContentRect())).boundingBox();
   frameRect.setLocation(roundedIntPoint(absoluteBoundingBox.location()));
 
   // Why is the protector needed?
   RefPtr<LayoutPart> protector(this);
-  frameViewBase->setFrameRect(frameRect);
+  frameViewBase.setFrameRect(frameRect);
 }
 
 void LayoutPart::invalidatePaintOfSubtreesIfNeeded(
     const PaintInvalidationState& paintInvalidationState) {
   if (frameViewBase() && frameViewBase()->isFrameView() &&
       !isThrottledFrameView()) {
     FrameView* childFrameView = toFrameView(frameViewBase());
     // |childFrameView| is in another document, which could be
     // missing its LayoutView. TODO(jchaffraix): Ideally we should
     // not need this code.
@@ skipping 10 matching lines @@
 }
 
 bool LayoutPart::isThrottledFrameView() const {
   if (!frameViewBase() || !frameViewBase()->isFrameView())
     return false;
   const FrameView* frameView = toFrameView(frameViewBase());
   return frameView->shouldThrottleRendering();
 }
 
 }  // namespace blink