Replace LayoutPart::GetFrameViewBase with GetNodeFrameView

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 71 matching lines @@
   // 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);
 }
 
-FrameViewBase* LayoutPart::GetFrameViewBase() const {
-  // Plugin FrameViewBases are stored in their DOM node.
-  Element* element = ToElement(GetNode());
-
-  if (element && element->IsFrameOwnerElement())
-    return ToHTMLFrameOwnerElement(element)->OwnedWidget();
-
+FrameView* LayoutPart::GetNodeFrameView() 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);
+  }
   return nullptr;
 }
 
 PluginView* LayoutPart::Plugin() const {
-  // Plugins are stored in their DOM node.
-  return GetNode() && IsHTMLPlugInElement(GetNode())
-             ? ToHTMLPlugInElement(GetNode())->Plugin()
-             : nullptr;
+  // Plugins are stored in HTMLPlugInElement node.
+  Node* node = GetNode();
+  return node && IsHTMLPlugInElement(node) ? ToHTMLPlugInElement(node)->Plugin()
+                                           : nullptr;
 }
 
 FrameViewBase* LayoutPart::PluginOrFrame() const {
-  FrameViewBase* result = GetFrameViewBase();
+  FrameViewBase* result = nullptr;
+  Node* node = GetNode();
+  if (node && node->IsFrameOwnerElement())
+    result = ToHTMLFrameOwnerElement(node)->OwnedWidget();
   if (!result)
     result = Plugin();
   return result;
 }
 
 PaintLayerType LayoutPart::LayerTypeRequired() const {
   PaintLayerType type = LayoutReplaced::LayerTypeRequired();
   if (type != kNoPaintLayer)
     return type;
   return kForcedPaintLayer;
@@ skipping 46 matching lines @@
     result.SetIsOverFrameViewBase(
         ContentBoxRect().Contains(result.LocalPoint()));
   }
   return inside;
 }
 
 bool LayoutPart::NodeAtPoint(HitTestResult& result,
                              const HitTestLocation& location_in_container,
                              const LayoutPoint& accumulated_offset,
                              HitTestAction action) {
-  if (!GetFrameViewBase() || !GetFrameViewBase()->IsFrameView() ||
-      !result.GetHitTestRequest().AllowsChildFrameContent()) {
+  FrameView* frame_view = GetNodeFrameView();
+  if (!frame_view || !result.GetHitTestRequest().AllowsChildFrameContent()) {
     return NodeAtPointOverFrameViewBase(result, location_in_container,
                                         accumulated_offset, action);
   }
 
   // A hit test can never hit an off-screen element; only off-screen iframes are
   // throttled; therefore, hit tests can skip descending into throttled iframes.
-  if (ToFrameView(GetFrameViewBase())->ShouldThrottleRendering()) {
+  if (frame_view->ShouldThrottleRendering()) {
     return NodeAtPointOverFrameViewBase(result, location_in_container,
                                         accumulated_offset, action);
   }
 
   DCHECK_GE(GetDocument().Lifecycle().GetState(),
             DocumentLifecycle::kCompositingClean);
 
   if (action == kHitTestForeground) {
-    FrameView* child_frame_view = ToFrameView(GetFrameViewBase());
+    FrameView* child_frame_view = GetNodeFrameView();

[dcheng, 2017/04/12 23:44:37]

Can we just use frame_view directly here? It seems like this is the same as
frame_view on line 182?

[joelhockey, 2017/04/13 00:37:01]

Yes, I can't see how this value could change, so no need for child_frame_view,
just reuse frame_view.  I have also renamed other child_frame_view var to
frame_view for consistency within the file.

     LayoutViewItem child_root_item = child_frame_view->GetLayoutViewItem();
 
     if (VisibleToHitTestRequest(result.GetHitTestRequest()) &&
         !child_root_item.IsNull()) {
       LayoutPoint adjusted_location = accumulated_offset + Location();
       LayoutPoint content_offset =
           LayoutPoint(BorderLeft() + PaddingLeft(),
                       BorderTop() + PaddingTop()) -
           LayoutSize(child_frame_view->ScrollOffsetInt());
       HitTestLocation new_hit_test_location(
@@ skipping 181 matching lines @@
       LocalToAbsoluteQuad(FloatRect(ReplacedContentRect())).BoundingBox();
   frame_rect.SetLocation(RoundedIntPoint(absolute_bounding_box.Location()));
 
   // Why is the protector needed?
   RefPtr<LayoutPart> protector(this);
   frame_view_base.SetFrameRect(frame_rect);
 }
 
 void LayoutPart::InvalidatePaintOfSubtreesIfNeeded(
     const PaintInvalidationState& paint_invalidation_state) {
-  if (GetFrameViewBase() && GetFrameViewBase()->IsFrameView() &&
-      !IsThrottledFrameView()) {
-    FrameView* child_frame_view = ToFrameView(GetFrameViewBase());
+  FrameView* child_frame_view = GetNodeFrameView();
+  if (child_frame_view && !IsThrottledFrameView()) {
     // |childFrameView| is in another document, which could be
     // missing its LayoutView. TODO(jchaffraix): Ideally we should
     // not need this code.
     if (LayoutView* child_layout_view =
             ToLayoutView(LayoutAPIShim::LayoutObjectFrom(
                 child_frame_view->GetLayoutViewItem()))) {
       PaintInvalidationState child_view_paint_invalidation_state(
           paint_invalidation_state, *child_layout_view);
       child_frame_view->InvalidateTreeIfNeeded(
           child_view_paint_invalidation_state);
     }
   }
 
   LayoutReplaced::InvalidatePaintOfSubtreesIfNeeded(paint_invalidation_state);
 }
 
 bool LayoutPart::IsThrottledFrameView() const {
-  if (!GetFrameViewBase() || !GetFrameViewBase()->IsFrameView())
-    return false;
-  const FrameView* frame_view = ToFrameView(GetFrameViewBase());
-  return frame_view->ShouldThrottleRendering();
+  if (FrameView* frame_view = GetNodeFrameView())
+    return frame_view->ShouldThrottleRendering();
+  return false;
 }
 
 }  // namespace blink