| Index: third_party/WebKit/Source/core/dom/Document.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
|
| index 822881ae673e4ced00ae24c01def3264468d8f46..fa853a7ebff2804acf2d2dd0acd31bec99a780ef 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/Document.cpp
|
| @@ -76,6 +76,7 @@
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/dom/ExecutionContextTask.h"
|
| #include "core/dom/FrameRequestCallback.h"
|
| +#include "core/dom/IntersectionObserverRegistry.h"
|
| #include "core/dom/LayoutTreeBuilderTraversal.h"
|
| #include "core/dom/MainThreadTaskRunner.h"
|
| #include "core/dom/Microtask.h"
|
| @@ -433,6 +434,7 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC
|
| , m_loadEventDelayCount(0)
|
| , m_loadEventDelayTimer(this, &Document::loadEventDelayTimerFired)
|
| , m_pluginLoadingTimer(this, &Document::pluginLoadingTimerFired)
|
| + , m_deliverIntersectionObservationsTimer(this, &Document::deliverIntersectionObservationsTimerFired)
|
| , m_documentTiming(*this)
|
| , m_writeRecursionIsTooDeep(false)
|
| , m_writeRecursionDepth(0)
|
| @@ -602,6 +604,8 @@ void Document::dispose()
|
| if (svgExtensions())
|
| accessSVGExtensions().pauseAnimations();
|
|
|
| + m_deliverIntersectionObservationsTimer.stop();
|
| +
|
| m_lifecycle.advanceTo(DocumentLifecycle::Disposed);
|
| DocumentLifecycleNotifier::notifyDocumentWasDisposed();
|
|
|
| @@ -4482,11 +4486,7 @@ WeakPtrWillBeRawPtr<Document> Document::contextDocument()
|
| if (m_contextDocument)
|
| return m_contextDocument;
|
| if (m_frame) {
|
| -#if ENABLE(OILPAN)
|
| - return this;
|
| -#else
|
| - return m_weakFactory.createWeakPtr();
|
| -#endif
|
| + return createWeakPtr();
|
| }
|
| return nullptr;
|
| }
|
| @@ -4962,6 +4962,29 @@ void Document::parseDNSPrefetchControlHeader(const String& dnsPrefetchControl)
|
| m_haveExplicitlyDisabledDNSPrefetch = true;
|
| }
|
|
|
| +WeakPtrWillBeRawPtr<Document> Document::createWeakPtr()
|
| +{
|
| +#if ENABLE(OILPAN)
|
| + return this;
|
| +#else
|
| + return m_weakFactory.createWeakPtr();
|
| +#endif
|
| +}
|
| +
|
| +IntersectionObserverRegistry* Document::intersectionObserverRegistry()
|
| +{
|
| + if (!m_intersectionObserverRegistry)
|
| + m_intersectionObserverRegistry = new IntersectionObserverRegistry(m_deliverIntersectionObservationsTimer);
|
| + return m_intersectionObserverRegistry.get();
|
| +}
|
| +
|
| +void Document::deliverIntersectionObservationsTimerFired(Timer<Document>*)
|
| +{
|
| + ASSERT(isMainThread());
|
| + ASSERT(m_intersectionObserverRegistry);
|
| + m_intersectionObserverRegistry->deliverIntersectionObservations();
|
| +}
|
| +
|
| void Document::reportBlockedScriptExecutionToInspector(const String& directiveText)
|
| {
|
| InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
|
| @@ -5019,6 +5042,8 @@ void Document::tasksWereResumed()
|
| m_scriptedAnimationController->resume();
|
|
|
| MutationObserver::resumeSuspendedObservers();
|
| + if (m_intersectionObserverRegistry)
|
| + m_intersectionObserverRegistry->resumeSuspendedIntersectionObservers();
|
| if (m_domWindow)
|
| DOMWindowPerformance::performance(*m_domWindow)->resumeSuspendedObservers();
|
| }
|
| @@ -5804,6 +5829,7 @@ DEFINE_TRACE(Document)
|
| visitor->trace(m_compositorPendingAnimations);
|
| visitor->trace(m_contextDocument);
|
| visitor->trace(m_canvasFontCache);
|
| + visitor->trace(m_intersectionObserverRegistry);
|
| WillBeHeapSupplementable<Document>::trace(visitor);
|
| #endif
|
| TreeScope::trace(visitor);
|
|
|