Rename *isOverWidget* methods to ...isOverFrameViewBase...

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 118 matching lines @@
 
   return false;
 }
 
 bool LayoutPart::needsPreferredWidthsRecalculation() const {
   if (LayoutReplaced::needsPreferredWidthsRecalculation())
     return true;
   return embeddedReplacedContent();
 }
 
-bool LayoutPart::nodeAtPointOverWidget(
+bool LayoutPart::nodeAtPointOverFrameViewBase(
     HitTestResult& result,
     const HitTestLocation& locationInContainer,
     const LayoutPoint& accumulatedOffset,
     HitTestAction action) {
   bool hadResult = result.innerNode();
   bool inside = LayoutReplaced::nodeAtPoint(result, locationInContainer,
                                             accumulatedOffset, action);
 
   // Check to see if we are really over the FrameViewBase itself (and not just
   // in the border/padding area).
   if ((inside || result.isRectBasedTest()) && !hadResult &&
-      result.innerNode() == node())
-    result.setIsOverWidget(contentBoxRect().contains(result.localPoint()));
+      result.innerNode() == node()) {
+    result.setIsOverFrameViewBase(
+        contentBoxRect().contains(result.localPoint()));
+  }
   return inside;
 }
 
 bool LayoutPart::nodeAtPoint(HitTestResult& result,
                              const HitTestLocation& locationInContainer,
                              const LayoutPoint& accumulatedOffset,
                              HitTestAction action) {
   if (!frameViewBase() || !frameViewBase()->isFrameView() ||
-      !result.hitTestRequest().allowsChildFrameContent())
-    return nodeAtPointOverWidget(result, locationInContainer, accumulatedOffset,
-                                 action);
+      !result.hitTestRequest().allowsChildFrameContent()) {
+    return nodeAtPointOverFrameViewBase(result, locationInContainer,
+                                        accumulatedOffset, 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(frameViewBase())->shouldThrottleRendering())
-    return nodeAtPointOverWidget(result, locationInContainer, accumulatedOffset,
-                                 action);
+  if (toFrameView(frameViewBase())->shouldThrottleRendering()) {
+    return nodeAtPointOverFrameViewBase(result, locationInContainer,
+                                        accumulatedOffset, action);
+  }
 
   ASSERT(document().lifecycle().state() >= DocumentLifecycle::CompositingClean);
 
   if (action == HitTestForeground) {
     FrameView* childFrameView = toFrameView(frameViewBase());
     LayoutViewItem childRootItem = childFrameView->layoutViewItem();
 
     if (visibleToHitTestRequest(result.hitTestRequest()) &&
         !childRootItem.isNull()) {
       LayoutPoint adjustedLocation = accumulatedOffset + location();
@@ skipping 15 matching lines @@
       } else if (isInsideChildFrame) {
         // Force the result not to be cacheable because the parent frame should
         // not cache this result; as it won't be notified of changes in the
         // child.
         childFrameResult.setCacheable(false);
         result = childFrameResult;
       }
 
       // Don't trust |isInsideChildFrame|. For rect-based hit-test, returns
       // true only when the hit test rect is totally within the iframe,
-      // i.e. nodeAtPointOverWidget() also returns true.
+      // i.e. nodeAtPointOverFrameViewBase() also returns true.
       // Use a temporary HitTestResult because we don't want to collect the
       // iframe element itself if the hit-test rect is totally within the
       // iframe.
       if (isInsideChildFrame) {
         if (!locationInContainer.isRectBasedTest())
           return true;
-        HitTestResult pointOverWidgetResult = result;
-        bool pointOverWidget =
-            nodeAtPointOverWidget(pointOverWidgetResult, locationInContainer,
-                                  accumulatedOffset, action);
-        if (pointOverWidget)
+        HitTestResult pointOverFrameViewBaseResult = result;
+        bool pointOverFrameViewBase = nodeAtPointOverFrameViewBase(
+            pointOverFrameViewBaseResult, locationInContainer,
+            accumulatedOffset, action);
+        if (pointOverFrameViewBase)
           return true;
-        result = pointOverWidgetResult;
+        result = pointOverFrameViewBaseResult;
         return false;
       }
     }
   }
 
-  return nodeAtPointOverWidget(result, locationInContainer, accumulatedOffset,
-                               action);
+  return nodeAtPointOverFrameViewBase(result, locationInContainer,
+                                      accumulatedOffset, action);
 }
 
 CompositingReasons LayoutPart::additionalCompositingReasons() const {
   if (requiresAcceleratedCompositing())
     return CompositingReasonIFrame;
   return CompositingReasonNone;
 }
 
 void LayoutPart::styleDidChange(StyleDifference diff,
                                 const ComputedStyle* oldStyle) {
@@ skipping 156 matching lines @@
 }
 
 bool LayoutPart::isThrottledFrameView() const {
   if (!frameViewBase() || !frameViewBase()->isFrameView())
     return false;
   const FrameView* frameView = toFrameView(frameViewBase());
   return frameView->shouldThrottleRendering();
 }
 
 }  // namespace blink