Merge Element::offsetParentForBindings() into offsetParent()

Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 526 matching lines @@
 }
 
 int Element::offsetHeight()
 {
     document().updateLayoutIgnorePendingStylesheets();
     if (LayoutBoxModelObject* renderer = layoutBoxModelObject())
         return adjustLayoutUnitForAbsoluteZoom(renderer->pixelSnappedOffsetHeight(), *renderer).round();
     return 0;
 }
 
-Element* Element::offsetParentForBindings()
-{
-    Element* element = offsetParent();
-    if (!element || !element->isInShadowTree())
-        return element;
-    return element->containingShadowRoot()->shouldExposeToBindings() ? element : nullptr;
-}
-
 Element* Element::offsetParent()
 {
     document().updateLayoutIgnorePendingStylesheets();
-    if (LayoutObject* renderer = this->layoutObject())
-        return renderer->offsetParent();
-    return nullptr;
+
+    LayoutObject* renderer = layoutObject();
+    if (!renderer)
+        return nullptr;
+
+    Element* element = renderer->offsetParent();
+    if (!element)
+        return nullptr;
+
+    if (element->isInShadowTree() && !element->containingShadowRoot()->shouldExposeToBindings())
+        return nullptr;
+
+    return element;
 }
 
 int Element::clientLeft()
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (LayoutBox* renderer = layoutBox())
         return adjustLayoutUnitForAbsoluteZoom(roundToInt(renderer->clientLeft()), *renderer);
     return 0;
 }
@@ skipping 2803 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink