Intersection Observer support for OOPIF

third_party/WebKit/Source/core/dom/IntersectionObservation.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/IntersectionObservation.h"
 
 #include "core/dom/ElementRareData.h"
 #include "core/dom/IntersectionObserver.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 35 matching lines @@
 void IntersectionObservation::initializeRootRect(LayoutRect& rect) const {
   LayoutObject* rootLayoutObject = m_observer->rootLayoutObject();
   if (rootLayoutObject->isLayoutView())
     rect = LayoutRect(
         toLayoutView(rootLayoutObject)->frameView()->visibleContentRect());
   else if (rootLayoutObject->isBox() && rootLayoutObject->hasOverflowClip())
     rect = LayoutRect(toLayoutBox(rootLayoutObject)->contentBoxRect());
   else
     rect = LayoutRect(
         toLayoutBoxModelObject(rootLayoutObject)->borderBoundingBox());
+  m_observer->intersectWithRemoteAncestorsIfNeeded(rect);
   applyRootMargin(rect);
 }
 
 void IntersectionObservation::clipToRoot(IntersectionGeometry& geometry) const {
   // Map and clip rect into root element coordinates.
   // TODO(szager): the writing mode flipping needs a test.
   DCHECK(m_target);
   LayoutBox* rootLayoutObject = toLayoutBox(m_observer->rootLayoutObject());
   LayoutObject* targetLayoutObject = target()->layoutObject();
 
@@ skipping 58 matching lines @@
                           targetDocument);
 
   rect.move(-scrollPosition);
 }
 
 static bool isContainingBlockChainDescendant(LayoutObject* descendant,
                                              LayoutObject* ancestor) {
   LocalFrame* ancestorFrame = ancestor->document().frame();
   LocalFrame* descendantFrame = descendant->document().frame();
 
-  if (ancestor->isLayoutView())
-    return descendantFrame && descendantFrame->tree().top() == ancestorFrame;
+  if (ancestor->isLayoutView()) {
+    return descendantFrame &&
+           descendantFrame->localFrameRoot() == ancestorFrame;
+  }
 
   if (ancestorFrame != descendantFrame)
     return false;
 
   while (descendant && descendant != ancestor)
     descendant = descendant->containingBlock();
   return descendant;
 }
 
 bool IntersectionObservation::computeGeometry(
@@ skipping 34 matching lines @@
 
   if (geometry.doesIntersect)
     mapRootRectToTargetFrameCoordinates(geometry.intersectionRect);
   else
     geometry.intersectionRect = LayoutRect();
 
   // Small optimization: if we're not going to report root bounds, don't bother
   // transforming them to the frame.
   if (m_shouldReportRootBounds)
     mapRootRectToRootFrameCoordinates(geometry.rootRect);
-
   return true;
 }
 
 void IntersectionObservation::computeIntersectionObservations(
     DOMHighResTimeStamp timestamp) {
   IntersectionGeometry geometry;
   if (!computeGeometry(geometry))
     return;
 
   // Some corner cases for threshold index:
@@ skipping 48 matching lines @@
     target()->ensureIntersectionObserverData().removeObservation(observer());
   m_observer.clear();
 }
 
 DEFINE_TRACE(IntersectionObservation) {
   visitor->trace(m_observer);
   visitor->trace(m_target);
 }
 
 }  // namespace blink