Title: [282487] trunk
Revision
282487
Author
[email protected]
Date
2021-09-15 21:39:52 -0700 (Wed, 15 Sep 2021)

Log Message

Fixes for build-webkit --minimal
https://bugs.webkit.org/show_bug.cgi?id=229780

Patch by Philip Chimento <[email protected]> on 2021-09-15
Reviewed by Fujii Hironori.

.:

Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Source/cmake/OptionsFTW.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:

Source/WebCore:

Covered by existing tests.

Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* dom/Document.cpp:
(WebCore::Document::~Document):
(WebCore::Document::intersectionObserversInitialUpdateTimerFired):
(WebCore::Document::scheduleRenderingUpdate):
* dom/Document.h:
(WebCore::Document::intersectionObserverDataIfExists):
* dom/Element.cpp:
(WebCore::Element::~Element):
(WebCore::Element::didMoveToNewDocument):
* dom/Element.h:
* dom/ElementRareData.cpp:
* dom/ElementRareData.h:
(WebCore::ElementRareData::setIntersectionObserverData):
* page/IntersectionObserver.cpp:
* page/IntersectionObserver.h:
* page/IntersectionObserver.idl:
* page/IntersectionObserverCallback.h:
* page/IntersectionObserverCallback.idl:
* page/IntersectionObserverEntry.cpp:
* page/IntersectionObserverEntry.h:
* page/IntersectionObserverEntry.idl:
* page/Page.cpp:
(WebCore::Page::updateRendering):
(WebCore::operator<<):
* page/Page.h:
* testing/Internals.cpp:
(WebCore::Internals::numberOfIntersectionObservers const):
* testing/Internals.h:
* testing/Internals.idl:

Source/WTF:

Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Scripts/Preferences/WebPreferencesExperimental.yaml:
* wtf/PlatformEnableCocoa.h:

Tools:

Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
quite broken if you try to disable it.

* Scripts/webkitperl/FeatureList.pm: Remove intersection-observer option

Modified Paths

Diff

Modified: trunk/ChangeLog (282486 => 282487)


--- trunk/ChangeLog	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/ChangeLog	2021-09-16 04:39:52 UTC (rev 282487)
@@ -1,3 +1,17 @@
+2021-09-15  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Source/cmake/OptionsFTW.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2021-09-14  John Wilander  <[email protected]>
 
         Rename RESOURCE_LOAD_STATISTICS to INTELLIGENT_TRACKING_PREVENTION

Modified: trunk/Source/WTF/ChangeLog (282486 => 282487)


--- trunk/Source/WTF/ChangeLog	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WTF/ChangeLog	2021-09-16 04:39:52 UTC (rev 282487)
@@ -1,3 +1,16 @@
+2021-09-15  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Scripts/Preferences/WebPreferencesExperimental.yaml:
+        * wtf/PlatformEnableCocoa.h:
+
 2021-09-15  Alex Christensen  <[email protected]>
 
         Add IDL skeleton for SharedWorker

Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (282486 => 282487)


--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml	2021-09-16 04:39:52 UTC (rev 282487)
@@ -587,7 +587,6 @@
   type: bool
   humanReadableName: "Intersection Observer"
   humanReadableDescription: "Enable Intersection Observer support"
-  condition: ENABLE(INTERSECTION_OBSERVER)
   defaultValue:
     WebKitLegacy:
       default: false

Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (282486 => 282487)


--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -313,10 +313,6 @@
 #define ENABLE_INSPECTOR_TELEMETRY 1
 #endif
 
-#if !defined(ENABLE_INTERSECTION_OBSERVER)
-#define ENABLE_INTERSECTION_OBSERVER 1
-#endif
-
 #if !defined(ENABLE_IOS_FORM_CONTROL_REFRESH) && PLATFORM(IOS_FAMILY)
 #define ENABLE_IOS_FORM_CONTROL_REFRESH 1
 #endif

Modified: trunk/Source/WebCore/ChangeLog (282486 => 282487)


--- trunk/Source/WebCore/ChangeLog	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/ChangeLog	2021-09-16 04:39:52 UTC (rev 282487)
@@ -1,3 +1,45 @@
+2021-09-15  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
+        Covered by existing tests.
+
+        Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * dom/Document.cpp:
+        (WebCore::Document::~Document):
+        (WebCore::Document::intersectionObserversInitialUpdateTimerFired):
+        (WebCore::Document::scheduleRenderingUpdate):
+        * dom/Document.h:
+        (WebCore::Document::intersectionObserverDataIfExists):
+        * dom/Element.cpp:
+        (WebCore::Element::~Element):
+        (WebCore::Element::didMoveToNewDocument):
+        * dom/Element.h:
+        * dom/ElementRareData.cpp:
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::setIntersectionObserverData):
+        * page/IntersectionObserver.cpp:
+        * page/IntersectionObserver.h:
+        * page/IntersectionObserver.idl:
+        * page/IntersectionObserverCallback.h:
+        * page/IntersectionObserverCallback.idl:
+        * page/IntersectionObserverEntry.cpp:
+        * page/IntersectionObserverEntry.h:
+        * page/IntersectionObserverEntry.idl:
+        * page/Page.cpp:
+        (WebCore::Page::updateRendering):
+        (WebCore::operator<<):
+        * page/Page.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::numberOfIntersectionObservers const):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2021-09-15  Myles C. Maxfield  <[email protected]>
 
         Fix Xcode build

Modified: trunk/Source/WebCore/dom/Document.cpp (282486 => 282487)


--- trunk/Source/WebCore/dom/Document.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/Document.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -387,9 +387,7 @@
     Vector<GCReachableRef<ContainerNode>> targets;
 };
 
-#if ENABLE(INTERSECTION_OBSERVER)
 static const Seconds intersectionObserversInitialUpdateDelay { 2000_ms };
-#endif
 
 // DOM Level 2 says (letters added):
 //
@@ -630,9 +628,7 @@
 #if ENABLE(FULLSCREEN_API)
     , m_fullscreenManager { makeUniqueRef<FullscreenManager>(*this) }
 #endif
-#if ENABLE(INTERSECTION_OBSERVER)
     , m_intersectionObserversInitialUpdateTimer(*this, &Document::intersectionObserversInitialUpdateTimerFired)
-#endif
     , m_loadEventDelayTimer(*this, &Document::loadEventDelayTimerFired)
 #if PLATFORM(IOS_FAMILY) && ENABLE(DEVICE_ORIENTATION)
     , m_deviceMotionClient(makeUnique<DeviceMotionClientIOS>(page() ? page()->deviceOrientationUpdateProvider() : nullptr))
@@ -704,7 +700,6 @@
     if (m_logger)
         m_logger->removeObserver(*this);
 
-#if ENABLE(INTERSECTION_OBSERVER)
     if (m_intersectionObserverData) {
         for (const auto& observer : m_intersectionObserverData->observers) {
             if (observer)
@@ -714,7 +709,6 @@
         // Document cannot be a target.
         ASSERT(m_intersectionObserverData->registrations.isEmpty());
     }
-#endif
 
     removeFromDocumentsMap();
 
@@ -7824,27 +7818,21 @@
     m_dynamicMediaQueryDependentImages.remove(element);
 }
 
-#if ENABLE(INTERSECTION_OBSERVER)
 void Document::intersectionObserversInitialUpdateTimerFired()
 {
     scheduleRenderingUpdate(RenderingUpdateStep::IntersectionObservations);
 }
-#endif
 
 void Document::scheduleRenderingUpdate(OptionSet<RenderingUpdateStep> requestedSteps)
 {
-#if ENABLE(INTERSECTION_OBSERVER)
     if (m_intersectionObserversInitialUpdateTimer.isActive()) {
         m_intersectionObserversInitialUpdateTimer.stop();
         requestedSteps.add(RenderingUpdateStep::IntersectionObservations);
     }
-#endif
     if (auto page = this->page())
         page->scheduleRenderingUpdate(requestedSteps);
 }
 
-#if ENABLE(INTERSECTION_OBSERVER)
-
 void Document::addIntersectionObserver(IntersectionObserver& observer)
 {
     ASSERT(m_intersectionObservers.find(&observer) == notFound);
@@ -8078,8 +8066,6 @@
     return *m_intersectionObserverData;
 }
 
-#endif
-
 #if ENABLE(RESIZE_OBSERVER)
 
 void Document::addResizeObserver(ResizeObserver& observer)

Modified: trunk/Source/WebCore/dom/Document.h (282486 => 282487)


--- trunk/Source/WebCore/dom/Document.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/Document.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -1428,7 +1428,6 @@
 
     void scheduleRenderingUpdate(OptionSet<RenderingUpdateStep>);
 
-#if ENABLE(INTERSECTION_OBSERVER)
     void addIntersectionObserver(IntersectionObserver&);
     void removeIntersectionObserver(IntersectionObserver&);
     unsigned numberOfIntersectionObservers() const { return m_intersectionObservers.size(); }
@@ -1436,7 +1435,6 @@
     void scheduleInitialIntersectionObservationUpdate();
     IntersectionObserverData& ensureIntersectionObserverData();
     IntersectionObserverData* intersectionObserverDataIfExists() { return m_intersectionObserverData.get(); }
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     void addResizeObserver(ResizeObserver&);
@@ -1932,13 +1930,11 @@
 
     WeakHashSet<HTMLImageElement> m_dynamicMediaQueryDependentImages;
 
-#if ENABLE(INTERSECTION_OBSERVER)
     Vector<WeakPtr<IntersectionObserver>> m_intersectionObservers;
     Vector<WeakPtr<IntersectionObserver>> m_intersectionObserversWithPendingNotifications;
     Timer m_intersectionObserversInitialUpdateTimer;
     // This is only non-null when this document is an explicit root.
     std::unique_ptr<IntersectionObserverData> m_intersectionObserverData;
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     Vector<WeakPtr<ResizeObserver>> m_resizeObservers;

Modified: trunk/Source/WebCore/dom/Element.cpp (282486 => 282487)


--- trunk/Source/WebCore/dom/Element.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/Element.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -206,9 +206,7 @@
     ASSERT(!beforePseudoElement());
     ASSERT(!afterPseudoElement());
 
-#if ENABLE(INTERSECTION_OBSERVER)
     disconnectFromIntersectionObservers();
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     disconnectFromResizeObservers();
@@ -2124,7 +2122,6 @@
     if (UNLIKELY(isDefinedCustomElement()))
         CustomElementReactionQueue::enqueueAdoptedCallbackIfNeeded(*this, oldDocument, newDocument);
 
-#if ENABLE(INTERSECTION_OBSERVER)
     if (auto* observerData = intersectionObserverDataIfExists()) {
         for (const auto& observer : observerData->observers) {
             if (observer->hasObservationTargets()) {
@@ -2133,7 +2130,6 @@
             }
         }
     }
-#endif
 }
 
 bool Element::hasAttributes() const
@@ -3892,8 +3888,6 @@
 
 #endif
 
-#if ENABLE(INTERSECTION_OBSERVER)
-
 void Element::disconnectFromIntersectionObservers()
 {
     auto* observerData = intersectionObserverDataIfExists();
@@ -3926,8 +3920,6 @@
     return hasRareData() ? elementRareData()->intersectionObserverData() : nullptr;
 }
 
-#endif
-
 ElementAnimationRareData* Element::animationRareData(PseudoId pseudoId) const
 {
     return hasRareData() ? elementRareData()->animationRareData(pseudoId) : nullptr;

Modified: trunk/Source/WebCore/dom/Element.h (282486 => 282487)


--- trunk/Source/WebCore/dom/Element.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/Element.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -69,14 +69,11 @@
 enum class SelectionRestorationMode : uint8_t;
 
 struct GetAnimationsOptions;
+struct IntersectionObserverData;
 struct KeyframeAnimationOptions;
 struct ScrollIntoViewOptions;
 struct ScrollToOptions;
 
-#if ENABLE(INTERSECTION_OBSERVER)
-struct IntersectionObserverData;
-#endif
-
 #if ENABLE(RESIZE_OBSERVER)
 struct ResizeObserverData;
 #endif
@@ -614,10 +611,8 @@
     using ContainerNode::setAttributeEventListener;
     void setAttributeEventListener(const AtomString& eventType, const QualifiedName& attributeName, const AtomString& value);
 
-#if ENABLE(INTERSECTION_OBSERVER)
     IntersectionObserverData& ensureIntersectionObserverData();
     IntersectionObserverData* intersectionObserverDataIfExists();
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     ResizeObserverData& ensureResizeObserverData();
@@ -707,9 +702,7 @@
     LayoutRect absoluteEventBounds(bool& boundsIncludeAllDescendantElements, bool& includesFixedPositionElements);
     LayoutRect absoluteEventBoundsOfElementAndDescendants(bool& includesFixedPositionElements);
 
-#if ENABLE(INTERSECTION_OBSERVER)
     void disconnectFromIntersectionObservers();
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     void disconnectFromResizeObservers();

Modified: trunk/Source/WebCore/dom/ElementRareData.cpp (282486 => 282487)


--- trunk/Source/WebCore/dom/ElementRareData.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/ElementRareData.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -38,9 +38,7 @@
     IntPoint savedLayerScrollPosition;
     Vector<std::unique_ptr<ElementAnimationRareData>> animationRareData;
     void* pointers[10];
-#if ENABLE(INTERSECTION_OBSERVER)
     void* intersectionObserverData;
-#endif
 #if ENABLE(CSS_TYPED_OM)
     void* typedOMData;
 #endif

Modified: trunk/Source/WebCore/dom/ElementRareData.h (282486 => 282487)


--- trunk/Source/WebCore/dom/ElementRareData.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/dom/ElementRareData.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -97,10 +97,8 @@
     const SpaceSplitString& partNames() const { return m_partNames; }
     void setPartNames(SpaceSplitString&& partNames) { m_partNames = WTFMove(partNames); }
 
-#if ENABLE(INTERSECTION_OBSERVER)
     IntersectionObserverData* intersectionObserverData() { return m_intersectionObserverData.get(); }
     void setIntersectionObserverData(std::unique_ptr<IntersectionObserverData>&& data) { m_intersectionObserverData = WTFMove(data); }
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     ResizeObserverData* resizeObserverData() { return m_resizeObserverData.get(); }
@@ -166,9 +164,8 @@
     RefPtr<ShadowRoot> m_shadowRoot;
     std::unique_ptr<CustomElementReactionQueue> m_customElementReactionQueue;
     std::unique_ptr<NamedNodeMap> m_attributeMap;
-#if ENABLE(INTERSECTION_OBSERVER)
+
     std::unique_ptr<IntersectionObserverData> m_intersectionObserverData;
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     std::unique_ptr<ResizeObserverData> m_resizeObserverData;

Modified: trunk/Source/WebCore/page/IntersectionObserver.cpp (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserver.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserver.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(INTERSECTION_OBSERVER)
 #include "IntersectionObserver.h"
 
 #include "CSSParserTokenRange.h"
@@ -303,5 +302,3 @@
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(INTERSECTION_OBSERVER)

Modified: trunk/Source/WebCore/page/IntersectionObserver.h (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserver.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserver.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(INTERSECTION_OBSERVER)
-
 #include "GCReachableRef.h"
 #include "IntersectionObserverCallback.h"
 #include "IntersectionObserverEntry.h"
@@ -126,5 +124,3 @@
 
 
 } // namespace WebCore
-
-#endif // ENABLE(INTERSECTION_OBSERVER)

Modified: trunk/Source/WebCore/page/IntersectionObserver.idl (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserver.idl	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserver.idl	2021-09-16 04:39:52 UTC (rev 282487)
@@ -26,7 +26,6 @@
 // https://wicg.github.io/IntersectionObserver/
 
 [
-    Conditional=INTERSECTION_OBSERVER,
     EnabledBySetting=IntersectionObserver,
     Exposed=Window,
     JSCustomMarkFunction,
@@ -46,7 +45,6 @@
 };
 
 [
-    Conditional=INTERSECTION_OBSERVER,
     EnabledBySetting=IntersectionObserver
 ]
 dictionary IntersectionObserverInit {

Modified: trunk/Source/WebCore/page/IntersectionObserverCallback.h (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserverCallback.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserverCallback.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(INTERSECTION_OBSERVER)
-
 #include "ActiveDOMCallback.h"
 #include "CallbackResult.h"
 #include <wtf/Forward.h>
@@ -47,5 +45,3 @@
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(INTERSECTION_OBSERVER)

Modified: trunk/Source/WebCore/page/IntersectionObserverCallback.idl (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserverCallback.idl	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserverCallback.idl	2021-09-16 04:39:52 UTC (rev 282487)
@@ -26,7 +26,6 @@
 // https://wicg.github.io/IntersectionObserver/
 
 [
-    Conditional=INTERSECTION_OBSERVER,
     CallbackThisObject=IntersectionObserver,
     IsWeakCallback,
 ] callback IntersectionObserverCallback = undefined (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);

Modified: trunk/Source/WebCore/page/IntersectionObserverEntry.cpp (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserverEntry.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserverEntry.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(INTERSECTION_OBSERVER)
 #include "IntersectionObserverEntry.h"
 
 #include "Element.h"
@@ -45,5 +44,3 @@
 }
 
 } // namespace WebCore
-
-#endif // ENABLE(INTERSECTION_OBSERVER)

Modified: trunk/Source/WebCore/page/IntersectionObserverEntry.h (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserverEntry.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserverEntry.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -25,8 +25,6 @@
 
 #pragma once
 
-#if ENABLE(INTERSECTION_OBSERVER)
-
 #include "DOMRectReadOnly.h"
 #include "Element.h"
 #include <wtf/RefCounted.h>
@@ -79,5 +77,3 @@
 
 
 } // namespace WebCore
-
-#endif // ENABLE(INTERSECTION_OBSERVER)

Modified: trunk/Source/WebCore/page/IntersectionObserverEntry.idl (282486 => 282487)


--- trunk/Source/WebCore/page/IntersectionObserverEntry.idl	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/IntersectionObserverEntry.idl	2021-09-16 04:39:52 UTC (rev 282487)
@@ -28,7 +28,6 @@
 typedef double DOMHighResTimeStamp;
 
 [
-    Conditional=INTERSECTION_OBSERVER,
     ImplementationLacksVTable,
     EnabledBySetting=IntersectionObserver,
     JSCustomMarkFunction,
@@ -45,9 +44,7 @@
     readonly attribute Element target;
 };
 
-[
-    Conditional=INTERSECTION_OBSERVER,
-] dictionary IntersectionObserverEntryInit {
+dictionary IntersectionObserverEntryInit {
     required DOMHighResTimeStamp time;
     required DOMRectInit? rootBounds;
     required DOMRectInit boundingClientRect;

Modified: trunk/Source/WebCore/page/Page.cpp (282486 => 282487)


--- trunk/Source/WebCore/page/Page.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/Page.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -1584,11 +1584,9 @@
 
     layoutIfNeeded();
 
-#if ENABLE(INTERSECTION_OBSERVER)
     runProcessingStep(RenderingUpdateStep::IntersectionObservations, [] (Document& document) {
         document.updateIntersectionObservations();
     });
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     runProcessingStep(RenderingUpdateStep::ResizeObservations, [&] (Document& document) {
@@ -3612,9 +3610,7 @@
     case RenderingUpdateStep::Animations: ts << "Animations"; break;
     case RenderingUpdateStep::Fullscreen: ts << "Fullscreen"; break;
     case RenderingUpdateStep::AnimationFrameCallbacks: ts << "AnimationFrameCallbacks"; break;
-#if ENABLE(INTERSECTION_OBSERVER)
     case RenderingUpdateStep::IntersectionObservations: ts << "IntersectionObservations"; break;
-#endif
 #if ENABLE(RESIZE_OBSERVER)
     case RenderingUpdateStep::ResizeObservations: ts << "ResizeObservations"; break;
 #endif

Modified: trunk/Source/WebCore/page/Page.h (282486 => 282487)


--- trunk/Source/WebCore/page/Page.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/page/Page.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -195,9 +195,7 @@
     Animations                      = 1 << 3,
     Fullscreen                      = 1 << 4,
     AnimationFrameCallbacks         = 1 << 5,
-#if ENABLE(INTERSECTION_OBSERVER)
     IntersectionObservations        = 1 << 6,
-#endif
 #if ENABLE(RESIZE_OBSERVER)
     ResizeObservations              = 1 << 7,
 #endif
@@ -218,9 +216,7 @@
     RenderingUpdateStep::Animations,
     RenderingUpdateStep::Fullscreen,
     RenderingUpdateStep::AnimationFrameCallbacks,
-#if ENABLE(INTERSECTION_OBSERVER)
     RenderingUpdateStep::IntersectionObservations,
-#endif
 #if ENABLE(RESIZE_OBSERVER)
     RenderingUpdateStep::ResizeObservations,
 #endif

Modified: trunk/Source/WebCore/testing/Internals.cpp (282486 => 282487)


--- trunk/Source/WebCore/testing/Internals.cpp	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/testing/Internals.cpp	2021-09-16 04:39:52 UTC (rev 282487)
@@ -2696,12 +2696,10 @@
 }
 #endif // ENABLE(WEB_AUDIO)
 
-#if ENABLE(INTERSECTION_OBSERVER)
 unsigned Internals::numberOfIntersectionObservers(const Document& document) const
 {
     return document.numberOfIntersectionObservers();
 }
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
 unsigned Internals::numberOfResizeObservers(const Document& document) const

Modified: trunk/Source/WebCore/testing/Internals.h (282486 => 282487)


--- trunk/Source/WebCore/testing/Internals.h	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/testing/Internals.h	2021-09-16 04:39:52 UTC (rev 282487)
@@ -474,9 +474,7 @@
     static bool isBaseAudioContextAlive(uint64_t contextID);
 #endif
 
-#if ENABLE(INTERSECTION_OBSERVER)
     unsigned numberOfIntersectionObservers(const Document&) const;
-#endif
 
 #if ENABLE(RESIZE_OBSERVER)
     unsigned numberOfResizeObservers(const Document&) const;

Modified: trunk/Source/WebCore/testing/Internals.idl (282486 => 282487)


--- trunk/Source/WebCore/testing/Internals.idl	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/WebCore/testing/Internals.idl	2021-09-16 04:39:52 UTC (rev 282487)
@@ -570,7 +570,7 @@
     unsigned long numberOfLiveNodes();
     unsigned long numberOfLiveDocuments();
     unsigned long referencingNodeCount(Document document);
-    [Conditional=INTERSECTION_OBSERVER] unsigned long numberOfIntersectionObservers(Document document);
+    unsigned long numberOfIntersectionObservers(Document document);
     [Conditional = RESIZE_OBSERVER] unsigned long numberOfResizeObservers(Document document);
     WindowProxy? openDummyInspectorFrontend(DOMString url);
     undefined closeDummyInspectorFrontend();

Modified: trunk/Source/cmake/OptionsFTW.cmake (282486 => 282487)


--- trunk/Source/cmake/OptionsFTW.cmake	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/cmake/OptionsFTW.cmake	2021-09-16 04:39:52 UTC (rev 282487)
@@ -81,7 +81,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MAC_GESTURE_EVENTS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MATHML PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CONTROLS_SCRIPT PRIVATE ON)

Modified: trunk/Source/cmake/OptionsMac.cmake (282486 => 282487)


--- trunk/Source/cmake/OptionsMac.cmake	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/cmake/OptionsMac.cmake	2021-09-16 04:39:52 UTC (rev 282487)
@@ -51,7 +51,6 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_EXTENSIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR_TELEMETRY PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTELLIGENT_TRACKING_PREVENTION PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INTERSECTION_OBSERVER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LAYOUT_FORMATTING_CONTEXT PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_CUSTOM_PROTOCOL_MANAGER PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LEGACY_ENCRYPTED_MEDIA PRIVATE ON)

Modified: trunk/Source/cmake/WebKitFeatures.cmake (282486 => 282487)


--- trunk/Source/cmake/WebKitFeatures.cmake	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Source/cmake/WebKitFeatures.cmake	2021-09-16 04:39:52 UTC (rev 282487)
@@ -158,7 +158,6 @@
     WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR_EXTENSIONS "Toggle inspector web extensions support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INSPECTOR_TELEMETRY "Toggle inspector telemetry support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_INTELLIGENT_TRACKING_PREVENTION "Toggle resource load statistics support" PRIVATE OFF)
-    WEBKIT_OPTION_DEFINE(ENABLE_INTERSECTION_OBSERVER "Enable Intersection Observer support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_IOS_GESTURE_EVENTS "Toggle iOS gesture events support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_IOS_TOUCH_EVENTS "Toggle iOS touch events support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_JIT "Toggle JustInTime _javascript_ support" PRIVATE ${ENABLE_JIT_DEFAULT})

Modified: trunk/Tools/ChangeLog (282486 => 282487)


--- trunk/Tools/ChangeLog	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Tools/ChangeLog	2021-09-16 04:39:52 UTC (rev 282487)
@@ -5,6 +5,18 @@
 
         Reviewed by Fujii Hironori.
 
+        Remove ENABLE_INTERSECTION_OBSERVER build-time option. This option is
+        quite broken if you try to disable it.
+
+        * Scripts/webkitperl/FeatureList.pm: Remove intersection-observer option
+
+2021-09-15  Philip Chimento  <[email protected]>
+
+        Fixes for build-webkit --minimal
+        https://bugs.webkit.org/show_bug.cgi?id=229780
+
+        Reviewed by Fujii Hironori.
+
         Remove the fast-jit-permissions, legacy-css-vendor-prefixes,
         webassembly-streaming-api, and webgpu options. These don't seem to exist
         anymore within the codebase and print an error if they are used.

Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (282486 => 282487)


--- trunk/Tools/Scripts/webkitperl/FeatureList.pm	2021-09-16 03:06:52 UTC (rev 282486)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm	2021-09-16 04:39:52 UTC (rev 282487)
@@ -103,7 +103,6 @@
     $inspectorAlternateDispatchersSupport,
     $inspectorTelemetrySupport,
     $intelligentTrackingPrevention,
-    $intersectionObserverSupport,
     $iosGestureEventsSupport,
     $iosTouchEventsSupport,
     $jitSupport,
@@ -343,9 +342,6 @@
     { option => "intelligent-tracking-prevention", desc => "Toggle intelligent tracking prevention support",
       define => "ENABLE_INTELLIGENT_TRACKING_PREVENTION", value => \$intelligentTrackingPrevention },
 
-    { option => "intersection-observer", desc => "Enable Intersection Observer support",
-      define => "ENABLE_INTERSECTION_OBSERVER", value => \$intersectionObserverSupport },
-
     { option => "ios-gesture-events", desc => "Toggle iOS gesture events support",
       define => "ENABLE_IOS_GESTURE_EVENTS", value => \$iosGestureEventsSupport },
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to