IntersectionObserver: second cut.

third_party/WebKit/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 42 matching lines @@
 #include "core/dom/CSSSelectorWatch.h"
 #include "core/dom/ClientRect.h"
 #include "core/dom/ClientRectList.h"
 #include "core/dom/DatasetDOMStringMap.h"
 #include "core/dom/ElementDataCache.h"
 #include "core/dom/ElementRareData.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/Fullscreen.h"
+#include "core/dom/IntersectionObserver.h"
+#include "core/dom/IntersectionObserverRegistry.h"
 #include "core/dom/LayoutTreeBuilder.h"
 #include "core/dom/MutationObserverInterestGroup.h"
 #include "core/dom/MutationRecord.h"
 #include "core/dom/NamedNodeMap.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/PresentationAttributeStyle.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/ScriptableDocumentParser.h"
 #include "core/dom/SelectorQuery.h"
 #include "core/dom/StyleChangeReason.h"
@@ skipping 26 matching lines @@
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLFormControlsCollection.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/HTMLOptionsCollection.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTableRowsCollection.h"
 #include "core/html/HTMLTemplateElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/layout/LayoutInline.h"
+#include "core/layout/LayoutPart.h"
 #include "core/layout/LayoutTextFragment.h"
 #include "core/layout/LayoutView.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/SpatialNavigation.h"
 #include "core/page/scrolling/ScrollCustomizationCallbacks.h"
 #include "core/page/scrolling/ScrollState.h"
@@ skipping 1342 matching lines @@
     ContainerNode::insertedInto(insertionPoint);
 
     if (containsFullScreenElement() && parentElement() && !parentElement()->containsFullScreenElement())
         setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(true);
 
     ASSERT(!hasRareData() || !elementRareData()->hasPseudoElements());
 
     if (!insertionPoint->isInTreeScope())
         return InsertionDone;
 
-    if (hasRareData())
-        elementRareData()->clearClassListValueForQuirksMode();
+    if (hasRareData()) {
+        ElementRareData* rareData = elementRareData();
+        rareData->clearClassListValueForQuirksMode();
+        if (rareData->hasIntersectionObserver()) {

[esprehn, 2015/12/12 00:14:13]

this code should be moved into a separate object for managing observers like
ElementIntersectionObserverData

this should be

if (ElementIntersectionObserverData* observerData =
rareData->intersectionObserverData())
  observerData->updateActive()

or something like that, these loops and such don't belong here.

[szager1, 2015/12/16 19:15:34]

I moved all the logic into ElementRareData and the new class
ElementIntersectionObserverData.

+            IntersectionObserverRegistry* registry = document().intersectionObserverRegistry();
+            for (auto& observer: rareData->intersectionObservers()) {
+                registry->addTrackedObserver(*observer);
+                observer->setActive(true);
+            }
+        }
+        if (rareData->hasIntersectionObservation()) {
+            for (auto& observation: rareData->intersectionObservations())

[esprehn, 2015/12/12 00:14:13]

space before :

this should also be moved into the controller object you hang off the rare data

[szager1, 2015/12/16 19:15:34]

same comment

+                observation->setActive(observation->observer()->isDescendantOfRoot(this));
+        }
+    }
 
     if (isUpgradedCustomElement() && inDocument())
         CustomElement::didAttach(this, document());
 
     TreeScope& scope = insertionPoint->treeScope();
     if (scope != treeScope())
         return InsertionDone;
 
     const AtomicString& idValue = getIdAttribute();
     if (!idValue.isNull())
@@ skipping 57 matching lines @@
 
     clearElementFlag(IsInCanvasSubtree);
 
     if (hasRareData()) {
         ElementRareData* data = elementRareData();
 
         data->clearRestyleFlags();
 
         if (ElementAnimations* elementAnimations = data->elementAnimations())
             elementAnimations->cssAnimations().cancel();
+
+        if (data->hasIntersectionObserver()) {

[esprehn, 2015/12/12 00:14:13]

if (ElementIntersectionObserverSet* observerSet =
data->intersectionObserverSet())
  observerSet->deactivate();

you can pass |this| to the methods if you don't want to store it.

[szager1, 2015/12/16 19:15:34]

I moved all the logic into ElementRareData and ElementIntersectionObserverData.

+            document().intersectionObserverRegistry()->removeTrackedObserversForRoot(this);
+            data->deactivateAllIntersectionObservers();
+        }
+        data->deactivateAllIntersectionObservations();

[esprehn, 2015/12/12 00:14:13]

this should be inside that same deactivate method, only 2 lines of code in
Element.cpp

[szager1, 2015/12/16 19:15:34]

same comment

     }
 }
 
 void Element::attach(const AttachContext& context)
 {
     ASSERT(document().inStyleRecalc());
 
     // We've already been through detach when doing an attach, but we might
     // need to clear any state that's been added since then.
     if (hasRareData() && styleChangeType() == NeedsReattachStyleChange) {
@@ skipping 2011 matching lines @@
         return false;
     if (isHTMLElement() && toHTMLElement(this)->hasDirectionAuto())
         return false;
     if (hasAnimations())
         return false;
     if (Fullscreen::isActiveFullScreenElement(*this))
         return false;
     return true;
 }
 
+WeakPtrWillBeRawPtr<Element> Element::createWeakPtr()
+{
+#if ENABLE(OILPAN)
+    return this;
+#else
+    return ensureElementRareData().createWeakPtr(this);

[esprehn, 2015/12/12 00:14:13]

Remove this, we shouldn't have a createWeakPtr method on Element, you can put it
inside your IntersectionObserverController if needed.

[szager1, 2015/12/16 19:15:34]

Done.

+#endif
+}
+
+void Element::addIntersectionObservation(IntersectionObservation& observation)
+{
+    ensureElementRareData().intersectionObservations().add(&observation);
+}
+
+void Element::removeIntersectionObservation(IntersectionObservation& observation)
+{
+    if (!hasRareData() || !elementRareData()->hasIntersectionObservation())

[esprehn, 2015/12/12 00:14:13]

how do we get here without having observations? normally this is an assert as it
should never happen.

[szager1, 2015/12/16 19:15:34]

Good point, fixed.

+        return;
+    elementRareData()->intersectionObservations().remove(&observation);
+}
+
 void Element::logAddElementIfIsolatedWorldAndInDocument(const char element[], const QualifiedName& attr1)
 {
     if (!inDocument())
         return;
     V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLoggerIfIsolatedWorld();
     if (!activityLogger)
         return;
     Vector<String, 2> argv;
     argv.append(element);
     argv.append(fastGetAttribute(attr1));
@@ skipping 48 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink