Merge Element::offsetParentForBindings() into offsetParent()

Source/core/page/SpatialNavigation.cpp

 /*
  * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Antonio Gomes <tonikitoo@webkit.org>
  *
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 348 matching lines @@
 
 static LayoutRect rectToAbsoluteCoordinates(LocalFrame* initialFrame, const LayoutRect& initialRect)
 {
     LayoutRect rect = initialRect;
     for (Frame* frame = initialFrame; frame; frame = frame->tree().parent()) {
         if (!frame->isLocalFrame())
             continue;
         // FIXME: Spatial navigation is broken for OOPI.
         Element* element = frame->deprecatedLocalOwner();
         if (element) {
-            for (; element; element = element->offsetParent())
+            do {
                 rect.move(element->offsetLeft(), element->offsetTop());
+                LayoutObject* layoutObject = element->layoutObject();
+                element = layoutObject ? layoutObject->offsetParent() : nullptr;
+            } while (element);
             rect.move((-toLocalFrame(frame)->view()->scrollOffset()));
         }
     }
     return rect;
 }
 
 LayoutRect nodeRectInAbsoluteCoordinates(Node* node, bool ignoreBorder)
 {
     ASSERT(node && node->layoutObject() && !node->document().view()->needsLayout());
 
@@ skipping 241 matching lines @@
     LayoutRect rect = virtualRectForDirection(type, rectToAbsoluteCoordinates(area.document().frame(), area.computeRect(area.imageElement()->layoutObject())), 1);
     return rect;
 }
 
 HTMLFrameOwnerElement* frameOwnerElement(FocusCandidate& candidate)
 {
     return candidate.isFrameOwnerElement() ? toHTMLFrameOwnerElement(candidate.visibleNode) : nullptr;
 };
 
 } // namespace blink