Remove FrameViewBase as base class of RemoteFrameView.

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 47 matching lines @@
 }
 
 void LayoutPart::WillBeDestroyed() {
   GetFrameView()->RemovePart(this);
 
   if (AXObjectCache* cache = GetDocument().ExistingAXObjectCache()) {
     cache->ChildrenChanged(this->Parent());
     cache->Remove(this);
   }
 
-  Element* element = ToElement(GetNode());
-  if (element && element->IsFrameOwnerElement())
-    ToHTMLFrameOwnerElement(element)->SetWidget(nullptr);
+  Node* node = GetNode();
+  if (node && node->IsFrameOwnerElement())
+    ToHTMLFrameOwnerElement(node)->SetWidget(nullptr);
 
   LayoutReplaced::WillBeDestroyed();
 }
 
 void LayoutPart::Destroy() {
   WillBeDestroyed();
   // We call clearNode here because LayoutPart is ref counted. This call to
   // destroy may not actually destroy the layout object. We can keep it around
   // because of references from the FrameView class. (The actual destruction of
   // the class happens in postDestroy() which is called from deref()).
   //
   // But, we've told the system we've destroyed the layoutObject, which happens
   // when the DOM node is destroyed. So there is a good change the DOM node this
   // object points too is invalid, so we have to clear the node so we make sure
   // we don't access it in the future.
   ClearNode();
   Deref();
 }
 
 LayoutPart::~LayoutPart() {
   DCHECK_LE(ref_count_, 0);
 }
 
 FrameView* LayoutPart::ChildFrameView() const {
-  // FrameViews are stored in HTMLFrameOwnerElement node.
-  Node* node = GetNode();
-  if (node && node->IsFrameOwnerElement()) {
-    FrameViewBase* frame_view_base =
-        ToHTMLFrameOwnerElement(node)->OwnedWidget();
-    if (frame_view_base && frame_view_base->IsFrameView())
-      return ToFrameView(frame_view_base);
-  }
+  FrameOrPlugin* frame_or_plugin = GetFrameOrPlugin();
+  if (frame_or_plugin && frame_or_plugin->IsFrameView())
+    return ToFrameView(frame_or_plugin);
   return nullptr;
 }
 
 PluginView* LayoutPart::Plugin() const {
-  // Plugins are stored in HTMLPlugInElement node.
-  Node* node = GetNode();
-  return node && IsHTMLPlugInElement(node) ? ToHTMLPlugInElement(node)->Plugin()
-                                           : nullptr;
+  FrameOrPlugin* frame_or_plugin = GetFrameOrPlugin();
+  if (frame_or_plugin && frame_or_plugin->IsPluginView())
+    return ToPluginView(frame_or_plugin);
+  return nullptr;
 }
 
 FrameOrPlugin* LayoutPart::GetFrameOrPlugin() const {
   Node* node = GetNode();
-  if (node && node->IsFrameOwnerElement()) {
-    FrameViewBase* frame_view_base =
-        ToHTMLFrameOwnerElement(node)->OwnedWidget();
-    if (frame_view_base) {
-      if (frame_view_base->IsFrameView())
-        return ToFrameView(frame_view_base);
-      if (frame_view_base->IsRemoteFrameView())
-        return ToRemoteFrameView(frame_view_base);
-      // Must be either FrameView or RemoteFrameView.
-      NOTREACHED();
-    }
-  }
-  return Plugin();
+  if (node && node->IsFrameOwnerElement())
+    return ToHTMLFrameOwnerElement(node)->OwnedWidget();
+  return nullptr;
 }
 
 PaintLayerType LayoutPart::LayerTypeRequired() const {
   PaintLayerType type = LayoutReplaced::LayerTypeRequired();
   if (type != kNoPaintLayer)
     return type;
   return kForcedPaintLayer;
 }
 
 bool LayoutPart::RequiresAcceleratedCompositing() const {
@@ skipping 282 matching lines @@
   LayoutReplaced::DeprecatedInvalidatePaintOfSubtrees(paint_invalidation_state);
 }
 
 bool LayoutPart::IsThrottledFrameView() const {
   if (FrameView* frame_view = ChildFrameView())
     return frame_view->ShouldThrottleRendering();
   return false;
 }
 
 }  // namespace blink