Enforce containing block requirement for IntersectionObserver.

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/layout/LayoutBox.h"
+#include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 
 namespace blink {
 
 IntersectionObservation::IntersectionObservation(IntersectionObserver& observer, Element& target, bool shouldReportRootBounds)
     : m_observer(observer)
     , m_target(target.ensureIntersectionObserverData().createWeakPtr(&target))
-    , m_active(true)
     , m_shouldReportRootBounds(shouldReportRootBounds)
     , m_lastThresholdIndex(0)
 {
 }
 
 Element* IntersectionObservation::target() const
 {
     return toElement(m_target.get());
 }
 
@@ skipping 50 matching lines @@
     geometry.targetRect.moveBy(-scrollPosition);
     geometry.intersectionRect.moveBy(-scrollPosition);
     geometry.rootRect.moveBy(-scrollPosition);
 }
 
 static void mapRectToDocumentCoordinates(LayoutObject& layoutObject, LayoutRect& rect)
 {
     rect = LayoutRect(layoutObject.localToAbsoluteQuad(FloatQuad(FloatRect(rect)), UseTransforms | ApplyContainerFlip | TraverseDocumentBoundaries).boundingBox());
 }
 
+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);

[esprehn, 2016/02/11 06:15:23]

remove parens

[szager1, 2016/02/11 18:17:24]

Done.

+
+    if (ancestorFrame != descendantFrame)
+        return false;
+
+    while (descendant && descendant != ancestor)
+        descendant = descendant->containingBlock();
+    return descendant;
+}
+
 bool IntersectionObservation::computeGeometry(IntersectionGeometry& geometry)
 {
-    ASSERT(m_target);
+    // Pre-oilpan, there will be a delay between the time when the target Element gets deleted
+    // (because its ref count dropped to zero) and when this IntersectionObservation gets
+    // deleted (during the next gc run, because the target Element is the only thing keeping
+    // the IntersectionObservation alive).  During that interval, we need to check that m_target
+    // hasn't been cleared.
+    Element* targetElement = target();
+    if (!targetElement || !targetElement->inDocument())
+        return false;
+    LayoutObject* targetLayoutObject = targetElement->layoutObject();
+    ASSERT(m_observer);
     LayoutObject* rootLayoutObject = m_observer->rootLayoutObject();
-    LayoutObject* targetLayoutObject = target()->layoutObject();
-    if (!rootLayoutObject->isBoxModelObject())
+    // TODO(szager): Support SVG
+    if (!targetLayoutObject || !(targetLayoutObject->isBoxModelObject() || targetLayoutObject->isText()))

[esprehn, 2016/02/11 06:15:23]

if (!targetLayoutObject)
  return false;
if (!targetLayoutObject->isBoxModelObject() && targetLayoutObject->isText()
  return false;

in general run demorgans.

[szager1, 2016/02/11 18:17:24]

Done.

         return false;
-    if (!targetLayoutObject->isBoxModelObject() && !targetLayoutObject->isText())
+    if (!rootLayoutObject || !rootLayoutObject->isBoxModelObject())
+        return false;
+    if (!isContainingBlockChainDescendant(targetLayoutObject, rootLayoutObject))
         return false;
 
     // Initialize targetRect and intersectionRect to bounds of target, in target's coordinate space.
     initializeGeometry(geometry);
 
     // TODO(szager): Support intersection observations for zero-area targets.  For now, we just
     // punt on the observation.
     if (!geometry.targetRect.size().width() || !geometry.targetRect.size().height())
         return false;
 
@@ skipping 10 matching lines @@
     clipToFrameView(geometry);
 
     if (geometry.intersectionRect.size().isZero())
         geometry.intersectionRect = LayoutRect();
 
     return true;
 }
 
 void IntersectionObservation::computeIntersectionObservations(DOMHighResTimeStamp timestamp)
 {
-    // Pre-oilpan, there will be a delay between the time when the target Element gets deleted
-    // (because its ref count dropped to zero) and when this IntersectionObservation gets
-    // deleted (during the next gc run, because the target Element is the only thing keeping
-    // the IntersectionObservation alive).  During that interval, we need to check that m_target
-    // hasn't been cleared.
-    Element* targetElement = target();
-    if (!targetElement || !isActive())
-        return;
-    LayoutObject* targetLayoutObject = targetElement->layoutObject();
-    // TODO(szager): Support SVG
-    if (!targetLayoutObject || (!targetLayoutObject->isBox() && !targetLayoutObject->isInline()))
-        return;
-
     IntersectionGeometry geometry;
     if (!computeGeometry(geometry))
         return;
 
     float intersectionArea = geometry.intersectionRect.size().width().toFloat() * geometry.intersectionRect.size().height().toFloat();
     float targetArea = geometry.targetRect.size().width().toFloat() * geometry.targetRect.size().height().toFloat();
     if (!targetArea)
         return;
     float newVisibleRatio = intersectionArea / targetArea;
     unsigned newThresholdIndex = observer().firstThresholdGreaterThan(newVisibleRatio);
     IntRect snappedRootBounds = pixelSnappedIntRect(geometry.rootRect);
     IntRect* rootBoundsPointer = m_shouldReportRootBounds ? &snappedRootBounds : nullptr;
     if (m_lastThresholdIndex != newThresholdIndex) {
         IntersectionObserverEntry* newEntry = new IntersectionObserverEntry(
             timestamp,
             pixelSnappedIntRect(geometry.targetRect),
             rootBoundsPointer,
             pixelSnappedIntRect(geometry.intersectionRect),
-            targetElement);
+            target());
         observer().enqueueIntersectionObserverEntry(*newEntry);
     }
     setLastThresholdIndex(newThresholdIndex);
 }
 
 void IntersectionObservation::disconnect()
 {
     IntersectionObserver* observer = m_observer;
     clearRootAndRemoveFromTarget();
     observer->removeObservation(*this);
 }
 
 void IntersectionObservation::clearRootAndRemoveFromTarget()
 {
     if (m_target)
         target()->ensureIntersectionObserverData().removeObservation(observer());
     m_observer.clear();
 }
 
 DEFINE_TRACE(IntersectionObservation)
 {
     visitor->trace(m_observer);
     visitor->trace(m_target);
 }
 
 } // namespace blink